code coverage

4 files changed, 49 insertions, 17 deletions

diff --git a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditor.java b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditor.java
index 76b1c847d79..49714be67fc 100644
--- a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditor.java
+++ b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditor.java
@@ -12,17 +12,18 @@ package org.eclipse.osee.coverage.editor;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.osee.coverage.editor.xcover.ICoverageEditorProvider;
 import org.eclipse.osee.coverage.internal.CoveragePlugin;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.logging.OseeLevel;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
 import org.eclipse.osee.framework.ui.plugin.util.Displays;
+import org.eclipse.osee.framework.ui.skynet.ImageManager;
 import org.eclipse.osee.framework.ui.skynet.OseeContributionItem;
 import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
 import org.eclipse.osee.framework.ui.skynet.artifact.editor.AbstractArtifactEditor;
@@ -48,7 +49,8 @@ public class CoverageEditor extends AbstractArtifactEditor implements IActionabl
       try {
          OseeContributionItem.addTo(this, true);
          createCoverageTab();
-         setPartName(getCoverageEditorInput().getName());
+         setPartName(getCoverageEditorProvider().getName());
+         setTitleImage(ImageManager.getImage(getCoverageEditorProvider().getTitleImage()));
          setActivePage(startPage);
       } catch (Exception ex) {
          OseeLog.log(CoveragePlugin.class, Level.SEVERE, ex);
@@ -86,6 +88,10 @@ public class CoverageEditor extends AbstractArtifactEditor implements IActionabl
       });
    }
 
+   public ICoverageEditorProvider getCoverageEditorProvider() {
+      return getCoverageEditorInput().getCoverageEditorProvider();
+   }
+
    public CoverageEditorInput getCoverageEditorInput() {
       IEditorInput editorInput = getEditorInput();
       if (!(editorInput instanceof CoverageEditorInput)) {
@@ -182,13 +188,6 @@ public class CoverageEditor extends AbstractArtifactEditor implements IActionabl
       return super.getAdapter(adapter);
    }
 
-   public Collection<? extends Object> getInput() {
-      if (getCoverageEditorInput().getCoverageImport() != null) {
-         return getCoverageEditorInput().getCoverageImport().getCoverageUnits();
-      } else
-         return Collections.emptyList();
-   }
-
    @Override
    public String getActionDescription() {
       return null;
diff --git a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorInput.java b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorInput.java
index 399dd09e6d5..8bd34d03a5b 100644
--- a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorInput.java
+++ b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorInput.java
@@ -11,7 +11,7 @@
 package org.eclipse.osee.coverage.editor;
 
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.osee.coverage.model.CoverageImport;
+import org.eclipse.osee.coverage.editor.xcover.ICoverageEditorProvider;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IPersistableElement;
 
@@ -20,10 +20,10 @@ import org.eclipse.ui.IPersistableElement;
  */
 public class CoverageEditorInput implements IEditorInput {
 
-   private final CoverageImport coverageImport;
+   private final ICoverageEditorProvider coverageEditorProvider;
 
-   public CoverageEditorInput(CoverageImport coverageImport) {
-      this.coverageImport = coverageImport;
+   public CoverageEditorInput(ICoverageEditorProvider coverageEditorProvider) {
+      this.coverageEditorProvider = coverageEditorProvider;
    }
 
    @Override
@@ -55,11 +55,11 @@ public class CoverageEditorInput implements IEditorInput {
 
    @Override
    public String getName() {
-      return coverageImport.getName();
+      return coverageEditorProvider.getName();
    }
 
-   public CoverageImport getCoverageImport() {
-      return coverageImport;
+   public ICoverageEditorProvider getCoverageEditorProvider() {
+      return coverageEditorProvider;
    }
 
 }
diff --git a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xcover/ICoverageEditorProvider.java b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xcover/ICoverageEditorProvider.java
new file mode 100644
index 00000000000..a8175c4eb52
--- /dev/null
+++ b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xcover/ICoverageEditorProvider.java
@@ -0,0 +1,20 @@
+/*

+ * Created on Sep 28, 2009

+ *

+ * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE

+ */

+package org.eclipse.osee.coverage.editor.xcover;

+

+import org.eclipse.osee.framework.ui.skynet.OseeImage;

+

+/**

+ * @author Donald G. Dunne

+ */

+public interface ICoverageEditorProvider {

+

+   public String getName();

+

+   public Object getInput();

+

+   public OseeImage getTitleImage();

+}

diff --git a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageImport.java b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageImport.java
index f8f6ec242e0..d06833512c5 100644
--- a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageImport.java
+++ b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageImport.java
@@ -13,8 +13,11 @@ package org.eclipse.osee.coverage.model;
 import java.util.ArrayList;

 import java.util.Date;

 import java.util.List;

+import org.eclipse.osee.coverage.editor.xcover.ICoverageEditorProvider;

+import org.eclipse.osee.coverage.util.CoverageImage;

 import org.eclipse.osee.framework.jdk.core.util.Collections;

 import org.eclipse.osee.framework.jdk.core.util.GUID;

+import org.eclipse.osee.framework.ui.skynet.OseeImage;

 import org.eclipse.osee.framework.ui.skynet.results.XResultData;

 import org.eclipse.osee.framework.ui.skynet.widgets.XDate;

 

@@ -23,7 +26,7 @@ import org.eclipse.osee.framework.ui.skynet.widgets.XDate;
  * 

  * @author Donald G. Dunne

  */

-public class CoverageImport {

+public class CoverageImport implements ICoverageEditorProvider {

 

    private final String guid = GUID.create();

    private final Date runDate;

@@ -106,4 +109,14 @@ public class CoverageImport {
    public XResultData getLog() {

       return logResultData;

    }

+

+   @Override

+   public Object getInput() {

+      return getCoverageUnits();

+   }

+

+   @Override

+   public OseeImage getTitleImage() {

+      return CoverageImage.COVERAGE;

+   }

 }