Fix compilation errors reported in Eclipse Mars (#119)

jacoco · May 24, 2016 · 455050e · 455050e
1 parent 03871c3
commit 455050e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/...nds.eclemma.core.test/src/com/mountainminds/eclemma/internal/core/SessionManagerTest.java b/...nds.eclemma.core.test/src/com/mountainminds/eclemma/internal/core/SessionManagerTest.java
@@ -499,18 +499,21 @@ public int getAttribute(String attributeName, int defaultValue)
  return 0;
  }
 
- public List<?> getAttribute(String attributeName,
- @SuppressWarnings("rawtypes") List defaultValue) throws CoreException {
+ @SuppressWarnings("rawtypes")
+ public List getAttribute(String attributeName, List defaultValue)
+ throws CoreException {
  return null;
  }
 
- public Set<?> getAttribute(String attributeName,
- @SuppressWarnings("rawtypes") Set defaultValue) throws CoreException {
+ @SuppressWarnings("rawtypes")
+ public Set getAttribute(String attributeName, Set defaultValue)
+ throws CoreException {
  return null;
  }
 
- public Map<?, ?> getAttribute(String attributeName,
- @SuppressWarnings("rawtypes") Map defaultValue) throws CoreException {
+ @SuppressWarnings("rawtypes")
+ public Map getAttribute(String attributeName, Map defaultValue)
+ throws CoreException {
  return null;
  }
 
@@ -519,7 +522,8 @@ public String getAttribute(String attributeName, String defaultValue)
  return null;
  }
 
- public Map<?, ?> getAttributes() throws CoreException {
+ @SuppressWarnings("rawtypes")
+ public Map getAttributes() throws CoreException {
  return null;
  }
 
@@ -547,7 +551,8 @@ public String getName() {
  return null;
  }
 
- public Set<?> getModes() throws CoreException {
+ @SuppressWarnings("rawtypes")
+ public Set getModes() throws CoreException {
  return null;
  }
 

diff --git a/com.mountainminds.eclemma.core/src/com/mountainminds/eclemma/core/ScopeUtils.java b/com.mountainminds.eclemma.core/src/com/mountainminds/eclemma/core/ScopeUtils.java
@@ -107,8 +107,9 @@ public static Set<IPackageFragmentRoot> getOverallScope(
  public static Set<IPackageFragmentRoot> getConfiguredScope(
  final ILaunchConfiguration configuration) throws CoreException {
  final Set<IPackageFragmentRoot> all = getOverallScope(configuration);
+ @SuppressWarnings("rawtypes")
  final List<?> selection = configuration.getAttribute(
- ICoverageLaunchConfigurationConstants.ATTR_SCOPE_IDS, (List<?>) null);
+ ICoverageLaunchConfigurationConstants.ATTR_SCOPE_IDS, (List) null);
  if (selection == null) {
  final DefaultScopeFilter filter = new DefaultScopeFilter(
  EclEmmaCorePlugin.getInstance().getPreferences());