Code cleanup according to Sonar warnings.

com.mountainminds.eclemma.core/src/com/mountainminds/eclemma/core/ICorePreferences.java

@@ -12,7 +12,6 @@
 package com.mountainminds.eclemma.core;
 
 import org.jacoco.core.runtime.AgentOptions;
-import org.jacoco.core.runtime.WildcardMatcher;
 
 /**
  * Clients may implement this interface to customize the behavior of the EclEmma
@@ -109,23 +108,23 @@ public String getAgentExclClassloader() {
    * Returns the wildcard expression for classes to include.
    * 
    * @return wildcard expression for classes to include
-   * @see WildcardMatcher
+   * @see org.jacoco.core.runtime.WildcardMatcher
    */
   public String getAgentIncludes();
 
   /**
    * Returns the wildcard expression for classes to exclude.
    * 
    * @return wildcard expression for classes to exclude
-   * @see WildcardMatcher
+   * @see org.jacoco.core.runtime.WildcardMatcher
    */
   public String getAgentExcludes();
 
   /**
    * Returns the wildcard expression for excluded class loaders.
    * 
    * @return expression for excluded class loaders
-   * @see WildcardMatcher
+   * @see org.jacoco.core.runtime.WildcardMatcher
    */
   public String getAgentExclClassloader();
 

com.mountainminds.eclemma.core/src/com/mountainminds/eclemma/core/ICoverageSession.java

@@ -14,7 +14,6 @@
 import java.util.Set;
 
 import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.jdt.core.IPackageFragmentRoot;
 
@@ -31,8 +30,8 @@
  * 
  * This interface is not intended to be implemented by clients.
  * 
- * @see CoverageTools#createCoverageSession(String, IClassFiles[], IPath[],
- *      ILaunchConfiguration)
+ * @see CoverageTools#createCoverageSession(String, IClassFiles[],
+ *      org.eclipse.core.runtime.IPath[], ILaunchConfiguration)
  */
 public interface ICoverageSession extends IAdaptable, IExecutionDataSource {
 

com.mountainminds.eclemma.core/src/com/mountainminds/eclemma/internal/core/JavaCoverageLoader.java

@@ -99,8 +99,9 @@ public JavaCoverageLoader(ISessionManager sessionManager) {
   }
 
   public void addJavaCoverageListener(IJavaCoverageListener l) {
-    if (l == null)
-      throw new NullPointerException();
+    if (l == null) {
+      throw new IllegalArgumentException();
+    }
     if (!listeners.contains(l)) {
       listeners.add(l);
     }

com.mountainminds.eclemma.core/src/com/mountainminds/eclemma/internal/core/SessionExporter.java

@@ -146,8 +146,10 @@ private IReportVisitor createFormatter() throws IOException {
     case CSV:
       final CSVFormatter csvFormatter = new CSVFormatter();
       return csvFormatter.createVisitor(out);
+    default:
+      out.close();
+      throw new AssertionError("Unexpected format " + format); //$NON-NLS-1$
     }
-    throw new AssertionError("Unexpected format " + format); //$NON-NLS-1$
   }
 
   private ISourceFileLocator createSourceFileLocator(IPackageFragmentRoot root)

com.mountainminds.eclemma.ui/src/com/mountainminds/eclemma/internal/ui/annotation/CoverageAnnotationModel.java

@@ -258,8 +258,9 @@ private void fireModelChanged(AnnotationModelEvent event) {
   }
 
   public void connect(IDocument document) {
-    if (this.document != document)
-      throw new RuntimeException("Can't connect to different document."); //$NON-NLS-1$
+    if (this.document != document) {
+      throw new IllegalArgumentException("Can't connect to different document."); //$NON-NLS-1$
+    }
     for (final CoverageAnnotation ca : annotations) {
       try {
         document.addPosition(ca.getPosition());
@@ -274,8 +275,10 @@ public void connect(IDocument document) {
   }
 
   public void disconnect(IDocument document) {
-    if (this.document != document)
-      throw new RuntimeException("Can't disconnect from different document."); //$NON-NLS-1$
+    if (this.document != document) {
+      throw new IllegalArgumentException(
+          "Can't disconnect from different document."); //$NON-NLS-1$
+    }
     for (final CoverageAnnotation ca : annotations) {
       document.removePosition(ca.getPosition());
     }

com.mountainminds.eclemma.ui/src/com/mountainminds/eclemma/internal/ui/editors/ExecutedClassesFilters.java

@@ -21,7 +21,7 @@
 /**
  * Filters for executed classes.
  */
-class ExecutedClassesFilters {
+final class ExecutedClassesFilters {
 
   public static ViewerFilter fromPatternString(final String pattern) {
     return new ViewerFilter() {
@@ -84,4 +84,9 @@ protected String getMatchedValue(Object toTest) {
     }
 
   }
+
+  // No instances
+  private ExecutedClassesFilters() {
+  }
+
 }

com.mountainminds.eclemma.ui/src/com/mountainminds/eclemma/internal/ui/handlers/ExportSessionHandler.java

@@ -52,8 +52,6 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
         event.getTrigger(), event.getApplicationContext());
     try {
       command.executeWithChecks(importEvent);
-    } catch (ExecutionException e) {
-      throw e;
     } catch (CommandException e) {
       EclEmmaUIPlugin.log(e);
     }

com.mountainminds.eclemma.ui/src/com/mountainminds/eclemma/internal/ui/handlers/ImportSessionHandler.java

@@ -47,8 +47,6 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
         event.getTrigger(), event.getApplicationContext());
     try {
       command.executeWithChecks(importEvent);
-    } catch (ExecutionException e) {
-      throw e;
     } catch (CommandException e) {
       EclEmmaUIPlugin.log(e);
     }

com.mountainminds.eclemma.ui/src/com/mountainminds/eclemma/internal/ui/wizards/SessionImportWizard.java

@@ -61,8 +61,10 @@ public void init(IWorkbench workbench, IStructuredSelection selection) {
   }
 
   public void addPages() {
-    addPage(page1 = new SessionImportPage1());
-    addPage(page2 = new SessionImportPage2());
+    page1 = new SessionImportPage1();
+    addPage(page1);
+    page2 = new SessionImportPage2();
+    addPage(page2);
   }
 
   public boolean performFinish() {

com.mountainminds.eclemma.ui/src/com/mountainminds/eclemma/ui/launching/CoverageTabGroup.java

@@ -70,7 +70,7 @@ protected ILaunchConfigurationTabGroup createDelegate(String type)
       }
     }
     if (element == null) {
-      String msg = "No tab group registered to run " + type; //$NON-NLS-1$;
+      String msg = "No tab group registered to run " + type; //$NON-NLS-1$
       throw new CoreException(EclEmmaUIPlugin.errorStatus(msg, null));
     } else {
       return (ILaunchConfigurationTabGroup) element