code coverage

20 files changed, 415 insertions, 539 deletions

diff --git a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/CoverageManagerTest.java b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/CoverageManagerTest.java
index 880477c6780..ce4392354a3 100644
--- a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/CoverageManagerTest.java
+++ b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/CoverageManagerTest.java
@@ -14,7 +14,7 @@ import static org.junit.Assert.fail;
 import java.util.List;

 import java.util.concurrent.CopyOnWriteArrayList;

 import org.eclipse.osee.coverage.CoverageManager;

-import org.eclipse.osee.coverage.test.import1.CoverageImport1TestNavigateItem;

+import org.eclipse.osee.coverage.test.import1.CoverageImport1TestBlam;

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

 import org.eclipse.osee.framework.logging.IHealthStatus;

 import org.eclipse.osee.framework.logging.OseeLog;

@@ -45,6 +45,6 @@ public class CoverageManagerTest {
 

    @org.junit.Test

    public void testImportCoverage() throws Exception {

-      CoverageManager.importCoverage(new CoverageImport1TestNavigateItem());

+      CoverageManager.importCoverage(new CoverageImport1TestBlam());

    }

 }

diff --git a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/CoverageImport1TestBlam.java b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/CoverageImport1TestBlam.java
index 859e8586df2..2f3a77f8c6c 100644
--- a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/CoverageImport1TestBlam.java
+++ b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/CoverageImport1TestBlam.java
@@ -11,59 +11,32 @@
 package org.eclipse.osee.coverage.test.import1;

 

 import java.util.Arrays;

-import java.util.Collection;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.osee.coverage.blam.AbstractCoverageBlam;

-import org.eclipse.osee.framework.core.exception.OseeCoreException;

-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;

-import org.eclipse.osee.framework.ui.plugin.util.Displays;

-import org.eclipse.osee.framework.ui.skynet.XWidgetParser;

-import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;

-import org.eclipse.osee.framework.ui.skynet.widgets.XModifiedListener;

-import org.eclipse.osee.framework.ui.skynet.widgets.XWidget;

-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayout;

-import org.eclipse.ui.forms.widgets.FormToolkit;

+import org.eclipse.osee.coverage.test.util.CoverageImportTestBlam;

 

 /**

  * @author Donald G. Dunne

  */

-public class CoverageImport1TestBlam extends AbstractCoverageBlam {

+public class CoverageImport1TestBlam extends CoverageImportTestBlam {

 

-   public static String COVERAGE_IMPORT_DIR = "Coverage Import Directory";

    public static String NAME = "Test Import 1";

 

-   @Override

-   public String getName() {

-      return NAME;

-   }

-

-   @Override

-   public void widgetCreated(XWidget xWidget, FormToolkit toolkit, Artifact art, DynamicXWidgetLayout dynamicXWidgetLayout, XModifiedListener modListener, boolean isEditable) throws OseeCoreException {

-      super.widgetCreated(xWidget, toolkit, art, dynamicXWidgetLayout, modListener, isEditable);

-   }

-

-   @Override

-   public String getXWidgetsXml() {

-      return XWidgetParser.EMPTY_WIDGETS;

-   }

-

-   @Override

-   public String getDescriptionUsage() {

-      return "Import from test area.";

-   }

-

-   @Override

-   public void runOperation(final VariableMap variableMap, IProgressMonitor monitor) throws Exception {

-      Displays.ensureInDisplayThread(new Runnable() {

-         public void run() {

-            setCoverageImport(new CoverageImport1TestNavigateItem().run());

-         };

-      });

-   }

-

-   @Override

-   public Collection<String> getCategories() {

-      return Arrays.asList("ATS");

+   public CoverageImport1TestBlam() {

+      super(NAME, Arrays.asList(

+            //

+            "import1/com/screenA/ComScrnAButton1.java",

+            "import1/com/screenA/ComScrnAButton2.java",

+            //

+            "import1/com/screenB/ScreenBButton1.java", "import1/com/screenB/ScreenBButton2.java",

+            "import1/com/screenB/ScreenBButton3.java",

+            //

+            "import1/epu/PowerUnit1.java", "import1/epu/PowerUnit2.java",

+            //

+            "import1/apu/AuxPowerUnit1.java", "import1/apu/AuxPowerUnit2.java",

+            //

+            "import1/nav/NavigationButton1.java", "import1/nav/NavigationButton2.java",

+            "import1/nav/NavigationButton3.java"

+      //

+      ));

    }

 

 }
\ No newline at end of file
diff --git a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/CoverageImport1TestNavigateItem.java b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/CoverageImport1TestNavigateItem.java
deleted file mode 100644
index 8ebe48f92fd..00000000000
--- a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/CoverageImport1TestNavigateItem.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2004, 2007 Boeing.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     Boeing - initial API and implementation

- *******************************************************************************/

-package org.eclipse.osee.coverage.test.import1;

-

-import java.net.URL;

-import java.util.Arrays;

-import org.eclipse.osee.coverage.CoverageManager;

-import org.eclipse.osee.coverage.ICoverageImporter;

-import org.eclipse.osee.coverage.internal.Activator;

-import org.eclipse.osee.coverage.model.CoverageImport;

-import org.eclipse.osee.coverage.model.CoverageUnit;

-import org.eclipse.osee.coverage.test.SampleJavaFileParser;

-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.skynet.widgets.xnavigate.XNavigateItem;

-import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItemAction;

-import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateComposite.TableLoadOption;

-

-/**

- * @author Donald G. Dunne

- */

-public class CoverageImport1TestNavigateItem extends XNavigateItemAction implements ICoverageImporter {

-

-   public static String PATH = "../../../../../../../src/org/eclipse/osee/coverage/test/import1/";

-

-   public CoverageImport1TestNavigateItem() {

-      this(null);

-   }

-

-   public CoverageImport1TestNavigateItem(XNavigateItem parent) {

-      super(parent, "Open Coverage Import 1");

-   }

-

-   @Override

-   public CoverageImport run() {

-

-      CoverageImport coverageImport = new CoverageImport(getName());

-      try {

-         for (String filename : Arrays.asList(

-         //

-               "com/screenA/ComScrnAButton1.java", "com/screenA/ComScrnAButton2.java",

-               //

-               "com/screenB/ScreenBButton1.java", "com/screenB/ScreenBButton2.java", "com/screenB/ScreenBButton3.java",

-               //

-               "epu/PowerUnit1.java", "epu/PowerUnit2.java",

-               //

-               "apu/AuxPowerUnit1.java", "apu/AuxPowerUnit2.java",

-               //

-               "nav/NavigationButton1.java", "nav/NavigationButton2.java", "nav/NavigationButton3.java"

-         //

-         )) {

-            System.err.println(String.format("Importing [%s]", PATH + filename));

-            URL url = CoverageImport1TestNavigateItem.class.getResource(PATH + filename);

-            CoverageUnit coverageUnit = SampleJavaFileParser.createCodeUnit(url);

-            String namespace = coverageUnit.getNamespace().replaceFirst("org.eclipse.osee.coverage.test.import1.", "");

-            coverageUnit.setNamespace(namespace);

-            CoverageUnit parentCoverageUnit = coverageImport.getOrCreateParent(namespace);

-            if (parentCoverageUnit != null) {

-               parentCoverageUnit.addCoverageUnit(coverageUnit);

-            } else {

-               coverageImport.addCoverageUnit(coverageUnit);

-            }

-         }

-         coverageImport.setLocation(PATH);

-      } catch (OseeCoreException ex) {

-         OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);

-      }

-      return coverageImport;

-   }

-

-   @Override

-   public void run(TableLoadOption... tableLoadOptions) throws Exception {

-      CoverageManager.importCoverage(new CoverageImport1TestNavigateItem());

-   }

-

-}

diff --git a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/CoveragePackage1Import1.java b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/CoveragePackage1Import1.java
index 185e0bb8c2c..3d78062eadb 100644
--- a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/CoveragePackage1Import1.java
+++ b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/CoveragePackage1Import1.java
@@ -10,47 +10,15 @@
  *******************************************************************************/

 package org.eclipse.osee.coverage.test.import1;

 

-import org.eclipse.osee.coverage.editor.CoverageEditor;

-import org.eclipse.osee.coverage.editor.CoverageEditorInput;

-import org.eclipse.osee.coverage.model.CoveragePackage;

-import org.eclipse.osee.framework.skynet.core.utility.IncrementingNum;

-import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;

+import org.eclipse.osee.coverage.test.util.CpCreateAndImportItem;

 import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItem;

-import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItemAction;

-import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateComposite.TableLoadOption;

 

 /**

  * @author Donald G. Dunne

  */

-public class CoveragePackage1Import1 extends XNavigateItemAction {

-

-   public CoveragePackage1Import1() {

-      super(null, "");

-   }

+public class CoveragePackage1Import1 extends CpCreateAndImportItem {

 

    public CoveragePackage1Import1(XNavigateItem parent) {

-      super(parent, "Open CP 1 - Import 1 - New CP");

-   }

-

-   @Override

-   public void run(TableLoadOption... tableLoadOptions) throws Exception {

-      CoveragePackage coveragePackage = new CoveragePackage(getName() + " - #" + IncrementingNum.get());

-      CoverageEditor.open(new CoverageEditorInput(coveragePackage));

-      // Process Import 1

-      CoverageEditor editor = null;

-      for (CoverageEditor coverageEditor : CoverageEditor.getEditors()) {

-         if (coverageEditor.getCoverageEditorInput().getCoveragePackageBase() instanceof CoveragePackage) {

-            CoveragePackage editorPackage =

-                  (CoveragePackage) coverageEditor.getCoverageEditorInput().getCoveragePackageBase();

-            if (editorPackage.getGuid().equals(coveragePackage.getGuid())) {

-               editor = coverageEditor;

-            }

-         }

-      }

-      if (editor == null) {

-         AWorkbench.popup("Can't access opened Editor");

-         return;

-      }

-      editor.simulateImport(CoverageImport1TestBlam.NAME);

+      super(parent, "Open CP 1 - Import 1 - New CP", CoverageImport1TestBlam.NAME);

    }

 }

diff --git a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/CoveragePackage1Import1B.java b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/CoveragePackage1Import1B.java
index 2985240e35b..6573714dd7b 100644
--- a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/CoveragePackage1Import1B.java
+++ b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/CoveragePackage1Import1B.java
@@ -10,54 +10,16 @@
  *******************************************************************************/

 package org.eclipse.osee.coverage.test.import1;

 

-import org.eclipse.osee.coverage.editor.CoverageEditor;

-import org.eclipse.osee.coverage.editor.CoverageEditorInput;

-import org.eclipse.osee.coverage.model.CoveragePackage;

-import org.eclipse.osee.coverage.store.OseeCoveragePackageStore;

-import org.eclipse.osee.coverage.util.dialog.CoveragePackageArtifactListDialog;

-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;

-import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;

+import org.eclipse.osee.coverage.test.util.CpSelectAndImportItem;

 import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItem;

-import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItemAction;

-import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateComposite.TableLoadOption;

 

 /**

  * @author Donald G. Dunne

  */

-public class CoveragePackage1Import1B extends XNavigateItemAction {

-

-   public CoveragePackage1Import1B() {

-      super(null, "");

-   }

+public class CoveragePackage1Import1B extends CpSelectAndImportItem {

 

    public CoveragePackage1Import1B(XNavigateItem parent) {

-      super(parent, "Open CP 1 - Import 1B - Choose CP");

+      super(parent, "Open CP 1 - Import 1B - Choose CP", CoverageImport1TestBlam.NAME);

    }

 

-   @Override

-   public void run(TableLoadOption... tableLoadOptions) throws Exception {

-      CoveragePackageArtifactListDialog dialog =

-            new CoveragePackageArtifactListDialog("Open Coverage Package", "Select Coverage Package");

-      dialog.setInput(OseeCoveragePackageStore.getCoveragePackageArtifacts());

-      if (dialog.open() != 0) return;

-      Artifact coveragePackageArtifact = (Artifact) dialog.getResult()[0];

-      CoveragePackage coveragePackage = OseeCoveragePackageStore.get(coveragePackageArtifact);

-      CoverageEditor.open(new CoverageEditorInput(coveragePackage));

-      // Process Import 1

-      CoverageEditor editor = null;

-      for (CoverageEditor coverageEditor : CoverageEditor.getEditors()) {

-         if (coverageEditor.getCoverageEditorInput().getCoveragePackageBase() instanceof CoveragePackage) {

-            CoveragePackage editorPackage =

-                  (CoveragePackage) coverageEditor.getCoverageEditorInput().getCoveragePackageBase();

-            if (editorPackage.getGuid().equals(coveragePackage.getGuid())) {

-               editor = coverageEditor;

-            }

-         }

-      }

-      if (editor == null) {

-         AWorkbench.popup("Can't access opened Editor");

-         return;

-      }

-      editor.simulateImport(CoverageImport1TestBlam.NAME);

-   }

 }

diff --git a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import2/CoverageImport2TestBlam.java b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import2/CoverageImport2TestBlam.java
index e6692c28d6a..e949e038875 100644
--- a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import2/CoverageImport2TestBlam.java
+++ b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import2/CoverageImport2TestBlam.java
@@ -11,59 +11,33 @@
 package org.eclipse.osee.coverage.test.import2;

 

 import java.util.Arrays;

-import java.util.Collection;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.osee.coverage.blam.AbstractCoverageBlam;

-import org.eclipse.osee.framework.core.exception.OseeCoreException;

-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;

-import org.eclipse.osee.framework.ui.plugin.util.Displays;

-import org.eclipse.osee.framework.ui.skynet.XWidgetParser;

-import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;

-import org.eclipse.osee.framework.ui.skynet.widgets.XModifiedListener;

-import org.eclipse.osee.framework.ui.skynet.widgets.XWidget;

-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayout;

-import org.eclipse.ui.forms.widgets.FormToolkit;

+import org.eclipse.osee.coverage.test.util.CoverageImportTestBlam;

 

 /**

  * @author Donald G. Dunne

  */

-public class CoverageImport2TestBlam extends AbstractCoverageBlam {

+public class CoverageImport2TestBlam extends CoverageImportTestBlam {

 

-   public static String COVERAGE_IMPORT_DIR = "Coverage Import Directory";

    public static String NAME = "Test Import 2";

 

-   @Override

-   public String getName() {

-      return NAME;

-   }

-

-   @Override

-   public void widgetCreated(XWidget xWidget, FormToolkit toolkit, Artifact art, DynamicXWidgetLayout dynamicXWidgetLayout, XModifiedListener modListener, boolean isEditable) throws OseeCoreException {

-      super.widgetCreated(xWidget, toolkit, art, dynamicXWidgetLayout, modListener, isEditable);

-   }

-

-   @Override

-   public String getXWidgetsXml() {

-      return XWidgetParser.EMPTY_WIDGETS;

-   }

-

-   @Override

-   public String getDescriptionUsage() {

-      return "Import from test area.";

-   }

-

-   @Override

-   public void runOperation(final VariableMap variableMap, IProgressMonitor monitor) throws Exception {

-      Displays.ensureInDisplayThread(new Runnable() {

-         public void run() {

-            setCoverageImport(new CoverageImport2TestNavigateItem().run());

-         };

-      });

-   }

-

-   @Override

-   public Collection<String> getCategories() {

-      return Arrays.asList("ATS");

+   public CoverageImport2TestBlam() {

+      super(NAME, Arrays.asList(

+            //

+            "import1/com/screenA/ComScrnAButton1.java",

+            "import1/com/screenA/ComScrnAButton2.java",

+            "import2/com/screenA/ComScrnAButton3.java",

+            //

+            "import1/com/screenB/ScreenBButton1.java", "import1/com/screenB/ScreenBButton2.java",

+            "import1/com/screenB/ScreenBButton3.java",

+            //

+            "import1/epu/PowerUnit1.java", "import1/epu/PowerUnit2.java", "import2/epu/PowerUnit3.java",

+            //

+            "import1/apu/AuxPowerUnit1.java", "import1/apu/AuxPowerUnit2.java",

+            //

+            "import1/nav/NavigationButton1.java", "import1/nav/NavigationButton2.java",

+            "import1/nav/NavigationButton3.java"

+      //

+      ));

    }

 

 }
\ No newline at end of file
diff --git a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import2/CoverageImport2TestNavigateItem.java b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import2/CoverageImport2TestNavigateItem.java
deleted file mode 100644
index 3da76e1c1e7..00000000000
--- a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import2/CoverageImport2TestNavigateItem.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2004, 2007 Boeing.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     Boeing - initial API and implementation

- *******************************************************************************/

-package org.eclipse.osee.coverage.test.import2;

-

-import java.net.URL;

-import java.util.Arrays;

-import org.eclipse.osee.coverage.CoverageManager;

-import org.eclipse.osee.coverage.ICoverageImporter;

-import org.eclipse.osee.coverage.internal.Activator;

-import org.eclipse.osee.coverage.model.CoverageImport;

-import org.eclipse.osee.coverage.model.CoverageUnit;

-import org.eclipse.osee.coverage.test.SampleJavaFileParser;

-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.skynet.widgets.xnavigate.XNavigateItem;

-import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItemAction;

-import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateComposite.TableLoadOption;

-

-/**

- * @author Donald G. Dunne

- */

-public class CoverageImport2TestNavigateItem extends XNavigateItemAction implements ICoverageImporter {

-

-   public static String PATH = "../../../../../../../src/org/eclipse/osee/coverage/test/";

-

-   public CoverageImport2TestNavigateItem() {

-      this(null);

-   }

-

-   public CoverageImport2TestNavigateItem(XNavigateItem parent) {

-      super(parent, "Open Coverage Import 2");

-   }

-

-   @Override

-   public CoverageImport run() {

-

-      CoverageImport coverageImport = new CoverageImport(getName());

-      try {

-         for (String filename : Arrays.asList(

-               //

-               "import1/com/screenA/ComScrnAButton1.java",

-               "import1/com/screenA/ComScrnAButton2.java",

-               //

-               "import1/com/screenB/ScreenBButton1.java", "import1/com/screenB/ScreenBButton2.java",

-               "import1/com/screenB/ScreenBButton3.java",

-               //

-               "import1/epu/PowerUnit1.java", "import1/epu/PowerUnit2.java", "import2/epu/PowerUnit3.java",

-               //

-               "import1/apu/AuxPowerUnit1.java", "import1/apu/AuxPowerUnit2.java",

-               //

-               "import1/nav/NavigationButton1.java", "import1/nav/NavigationButton2.java",

-               "import1/nav/NavigationButton3.java"

-         //

-         )) {

-            System.err.println(String.format("Importing [%s]", PATH + filename));

-            URL url = CoverageImport2TestNavigateItem.class.getResource(PATH + filename);

-            CoverageUnit coverageUnit = SampleJavaFileParser.createCodeUnit(url);

-            String namespace = coverageUnit.getNamespace().replaceFirst("org.eclipse.osee.coverage.test.import..", "");

-            coverageUnit.setNamespace(namespace);

-            CoverageUnit parentCoverageUnit = coverageImport.getOrCreateParent(namespace);

-            if (parentCoverageUnit != null) {

-               parentCoverageUnit.addCoverageUnit(coverageUnit);

-            } else {

-               coverageImport.addCoverageUnit(coverageUnit);

-            }

-         }

-         coverageImport.setLocation(PATH);

-      } catch (OseeCoreException ex) {

-         OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);

-      }

-      return coverageImport;

-   }

-

-   @Override

-   public void run(TableLoadOption... tableLoadOptions) throws Exception {

-      CoverageManager.importCoverage(new CoverageImport2TestNavigateItem());

-   }

-

-}

diff --git a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import2/CoveragePackage1Import2.java b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import2/CoveragePackage1Import2.java
index f573baa11a2..c7884f0f047 100644
--- a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import2/CoveragePackage1Import2.java
+++ b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import2/CoveragePackage1Import2.java
@@ -10,54 +10,16 @@
  *******************************************************************************/

 package org.eclipse.osee.coverage.test.import2;

 

-import org.eclipse.osee.coverage.editor.CoverageEditor;

-import org.eclipse.osee.coverage.editor.CoverageEditorInput;

-import org.eclipse.osee.coverage.model.CoveragePackage;

-import org.eclipse.osee.coverage.store.OseeCoveragePackageStore;

-import org.eclipse.osee.coverage.util.dialog.CoveragePackageArtifactListDialog;

-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;

-import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;

+import org.eclipse.osee.coverage.test.util.CpSelectAndImportItem;

 import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItem;

-import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItemAction;

-import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateComposite.TableLoadOption;

 

 /**

  * @author Donald G. Dunne

  */

-public class CoveragePackage1Import2 extends XNavigateItemAction {

-

-   public CoveragePackage1Import2() {

-      super(null, "");

-   }

+public class CoveragePackage1Import2 extends CpSelectAndImportItem {

 

    public CoveragePackage1Import2(XNavigateItem parent) {

-      super(parent, "Open CP 1 - Import 2 - Add epu.PowerUnit3");

+      super(parent, "Open CP 1 - Import 2 - Add epu.PowerUnit3", CoverageImport2TestBlam.NAME);

    }

 

-   @Override

-   public void run(TableLoadOption... tableLoadOptions) throws Exception {

-      CoveragePackageArtifactListDialog dialog =

-            new CoveragePackageArtifactListDialog("Open Coverage Package", "Select Coverage Package");

-      dialog.setInput(OseeCoveragePackageStore.getCoveragePackageArtifacts());

-      if (dialog.open() != 0) return;

-      Artifact coveragePackageArtifact = (Artifact) dialog.getResult()[0];

-      CoveragePackage coveragePackage = OseeCoveragePackageStore.get(coveragePackageArtifact);

-      CoverageEditor.open(new CoverageEditorInput(coveragePackage));

-      // Process Import 1

-      CoverageEditor editor = null;

-      for (CoverageEditor coverageEditor : CoverageEditor.getEditors()) {

-         if (coverageEditor.getCoverageEditorInput().getCoveragePackageBase() instanceof CoveragePackage) {

-            CoveragePackage editorPackage =

-                  (CoveragePackage) coverageEditor.getCoverageEditorInput().getCoveragePackageBase();

-            if (editorPackage.getGuid().equals(coveragePackage.getGuid())) {

-               editor = coverageEditor;

-            }

-         }

-      }

-      if (editor == null) {

-         AWorkbench.popup("Can't access opened Editor");

-         return;

-      }

-      editor.simulateImport(CoverageImport2TestBlam.NAME);

-   }

 }

diff --git a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import2/com/screenA/ComScrnAButton3.java b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import2/com/screenA/ComScrnAButton3.java
new file mode 100644
index 00000000000..7a635b9ff5e
--- /dev/null
+++ b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import2/com/screenA/ComScrnAButton3.java
@@ -0,0 +1,52 @@
+/*******************************************************************************

+ * Copyright (c) 2004, 2007 Boeing.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *     Boeing - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.osee.coverage.test.import2.com.screenA;

+

+import java.util.logging.Level;

+import org.eclipse.osee.coverage.internal.Activator;

+import org.eclipse.osee.framework.logging.OseeLog;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Button;

+import org.eclipse.swt.widgets.Composite;

+

+/**

+ * @author Donald G. Dunne

+ */

+public class ComScrnAButton3 extends Button {

+

+   public Image image;

+

+   /**

+    * @param parent

+    * @param style

+    */

+   public ComScrnAButton3(Composite parent, int style, Image image) {

+      super(parent, style);

+   }

+

+   @Override

+   public Image getImage() {

+      try {

+         if (getStyle() == 4) { // 1, 1, TestUnit1|TestUnit3

+            return this.image; // 1, 2, n

+         } else {

+            return super.getImage(); // 1, 3, TestUnit3

+         }

+      } catch (IllegalArgumentException ex) {

+         OseeLog.log(Activator.class, Level.SEVERE, ex); // 1, 4, n

+

+      } catch (Exception ex) {

+         OseeLog.log(Activator.class, Level.SEVERE, ex); // 1, 5, n

+      }

+      return null; // 1, 6, n

+   }

+

+}

diff --git a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import3/CoverageImport3TestBlam.java b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import3/CoverageImport3TestBlam.java
index 45d6b0dfbb6..17d256c11e0 100644
--- a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import3/CoverageImport3TestBlam.java
+++ b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import3/CoverageImport3TestBlam.java
@@ -11,59 +11,32 @@
 package org.eclipse.osee.coverage.test.import3;

 

 import java.util.Arrays;

-import java.util.Collection;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.osee.coverage.blam.AbstractCoverageBlam;

-import org.eclipse.osee.framework.core.exception.OseeCoreException;

-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;

-import org.eclipse.osee.framework.ui.plugin.util.Displays;

-import org.eclipse.osee.framework.ui.skynet.XWidgetParser;

-import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;

-import org.eclipse.osee.framework.ui.skynet.widgets.XModifiedListener;

-import org.eclipse.osee.framework.ui.skynet.widgets.XWidget;

-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayout;

-import org.eclipse.ui.forms.widgets.FormToolkit;

+import org.eclipse.osee.coverage.test.util.CoverageImportTestBlam;

 

 /**

  * @author Donald G. Dunne

  */

-public class CoverageImport3TestBlam extends AbstractCoverageBlam {

+public class CoverageImport3TestBlam extends CoverageImportTestBlam {

 

-   public static String COVERAGE_IMPORT_DIR = "Coverage Import Directory";

    public static String NAME = "Test Import 3";

 

-   @Override

-   public String getName() {

-      return NAME;

-   }

-

-   @Override

-   public void widgetCreated(XWidget xWidget, FormToolkit toolkit, Artifact art, DynamicXWidgetLayout dynamicXWidgetLayout, XModifiedListener modListener, boolean isEditable) throws OseeCoreException {

-      super.widgetCreated(xWidget, toolkit, art, dynamicXWidgetLayout, modListener, isEditable);

-   }

-

-   @Override

-   public String getXWidgetsXml() {

-      return XWidgetParser.EMPTY_WIDGETS;

-   }

-

-   @Override

-   public String getDescriptionUsage() {

-      return "Import from test area.";

-   }

-

-   @Override

-   public void runOperation(final VariableMap variableMap, IProgressMonitor monitor) throws Exception {

-      Displays.ensureInDisplayThread(new Runnable() {

-         public void run() {

-            setCoverageImport(new CoverageImport3TestNavigateItem().run());

-         };

-      });

-   }

-

-   @Override

-   public Collection<String> getCategories() {

-      return Arrays.asList("ATS");

+   public CoverageImport3TestBlam() {

+      super(NAME, Arrays.asList(

+            //

+            "import3/com/screenA/ComScrnAButton1.java",

+            "import1/com/screenA/ComScrnAButton2.java",

+            //

+            "import1/com/screenB/ScreenBButton1.java", "import1/com/screenB/ScreenBButton2.java",

+            "import1/com/screenB/ScreenBButton3.java",

+            //

+            "import3/epu/PowerUnit1.java", "import1/epu/PowerUnit2.java",

+            //

+            "import1/apu/AuxPowerUnit1.java", "import1/apu/AuxPowerUnit2.java",

+            //

+            "import1/nav/NavigationButton1.java", "import1/nav/NavigationButton2.java",

+            "import1/nav/NavigationButton3.java"

+      //

+      ));

    }

 

 }
\ No newline at end of file
diff --git a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import3/CoverageImport3TestNavigateItem.java b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import3/CoverageImport3TestNavigateItem.java
deleted file mode 100644
index 94c1e913730..00000000000
--- a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import3/CoverageImport3TestNavigateItem.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2004, 2007 Boeing.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     Boeing - initial API and implementation

- *******************************************************************************/

-package org.eclipse.osee.coverage.test.import3;

-

-import java.net.URL;

-import java.util.Arrays;

-import org.eclipse.osee.coverage.CoverageManager;

-import org.eclipse.osee.coverage.ICoverageImporter;

-import org.eclipse.osee.coverage.internal.Activator;

-import org.eclipse.osee.coverage.model.CoverageImport;

-import org.eclipse.osee.coverage.model.CoverageUnit;

-import org.eclipse.osee.coverage.test.SampleJavaFileParser;

-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.skynet.widgets.xnavigate.XNavigateItem;

-import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItemAction;

-import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateComposite.TableLoadOption;

-

-/**

- * @author Donald G. Dunne

- */

-public class CoverageImport3TestNavigateItem extends XNavigateItemAction implements ICoverageImporter {

-

-   public static String PATH = "../../../../../../../src/org/eclipse/osee/coverage/test/";

-

-   public CoverageImport3TestNavigateItem() {

-      this(null);

-   }

-

-   public CoverageImport3TestNavigateItem(XNavigateItem parent) {

-      super(parent, "Open Coverage Import 3");

-   }

-

-   @Override

-   public CoverageImport run() {

-

-      CoverageImport coverageImport = new CoverageImport(getName());

-      try {

-         for (String filename : Arrays.asList(

-               //

-               "import3/com/screenA/ComScrnAButton1.java",

-               "import1/com/screenA/ComScrnAButton2.java",

-               //

-               "import1/com/screenB/ScreenBButton1.java", "import1/com/screenB/ScreenBButton2.java",

-               "import1/com/screenB/ScreenBButton3.java",

-               //

-               "import3/epu/PowerUnit1.java", "import1/epu/PowerUnit2.java",

-               //

-               "import1/apu/AuxPowerUnit1.java", "import1/apu/AuxPowerUnit2.java",

-               //

-               "import1/nav/NavigationButton1.java", "import1/nav/NavigationButton2.java",

-               "import1/nav/NavigationButton3.java"

-         //

-         )) {

-            System.err.println(String.format("Importing [%s]", PATH + filename));

-            URL url = CoverageImport3TestNavigateItem.class.getResource(PATH + filename);

-            CoverageUnit coverageUnit = SampleJavaFileParser.createCodeUnit(url);

-            String namespace = coverageUnit.getNamespace().replaceFirst("org.eclipse.osee.coverage.test.import..", "");

-            coverageUnit.setNamespace(namespace);

-            CoverageUnit parentCoverageUnit = coverageImport.getOrCreateParent(namespace);

-            if (parentCoverageUnit != null) {

-               parentCoverageUnit.addCoverageUnit(coverageUnit);

-            } else {

-               coverageImport.addCoverageUnit(coverageUnit);

-            }

-         }

-         coverageImport.setLocation(PATH);

-      } catch (OseeCoreException ex) {

-         OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);

-      }

-      return coverageImport;

-   }

-

-   @Override

-   public void run(TableLoadOption... tableLoadOptions) throws Exception {

-      CoverageManager.importCoverage(new CoverageImport3TestNavigateItem());

-   }

-

-}

diff --git a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import3/com/screenA/ComScrnAButton1.java b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import3/com/screenA/ComScrnAButton1.java
index 09437fee4bb..75b4990d547 100644
--- a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import3/com/screenA/ComScrnAButton1.java
+++ b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import3/com/screenA/ComScrnAButton1.java
@@ -38,17 +38,8 @@ public class ComScrnAButton1 extends Button {
    }

 

    @Override

-   public String getText() {

-      try {

-         if (getStyle() == 4) { // 1, 1, TestUnit1|TestUnit2

-            return "Navigate Here"; // 1, 2, TestUnit2

-         } else {

-            return "Navigate There"; // 1, 3, TestUnit3|TestUnit4

-         }

-      } catch (Exception ex) {

-         OseeLog.log(Activator.class, Level.SEVERE, ex); // 1, 4, n

-      }

-      return "Navigate";

+   public void setText(String string) {

+      super.setText(string); // 3, 1, n

    }

 

    @Override

@@ -69,8 +60,17 @@ public class ComScrnAButton1 extends Button {
    }

 

    @Override

-   public void setText(String string) {

-      super.setText(string); // 3, 1, n

+   public String getText() {

+      try {

+         if (getStyle() == 4) { // 1, 1, TestUnit1|TestUnit2

+            return "Navigate Here"; // 1, 2, TestUnit2

+         } else {

+            return "Navigate There"; // 1, 3, TestUnit3|TestUnit4

+         }

+      } catch (Exception ex) {

+         OseeLog.log(Activator.class, Level.SEVERE, ex); // 1, 4, n

+      }

+      return "Navigate";

    }

 

 }

diff --git a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageUnitPersistTest.java b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageUnitPersistTest.java
index b0e001bfa1a..4570dbb3146 100644
--- a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageUnitPersistTest.java
+++ b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageUnitPersistTest.java
@@ -18,7 +18,7 @@ import org.eclipse.osee.coverage.model.CoveragePackage;
 import org.eclipse.osee.coverage.model.CoverageUnit;

 import org.eclipse.osee.coverage.store.OseeCoveragePackageStore;

 import org.eclipse.osee.coverage.test.SampleJavaFileParser;

-import org.eclipse.osee.coverage.test.import1.CoverageImport1TestNavigateItem;

+import org.eclipse.osee.coverage.test.import1.CoverageImport1TestBlam;

 import org.eclipse.osee.coverage.test.util.CoverageTestUtil;

 import org.eclipse.osee.coverage.util.CoveragePackageImportManager;

 import org.eclipse.osee.coverage.util.CoverageUtil;

@@ -68,7 +68,7 @@ public class CoverageUnitPersistTest {
          //

          )) {

             System.err.println(String.format("Importing [%s]", PATH + filename));

-            URL url = CoverageImport1TestNavigateItem.class.getResource(PATH + filename);

+            URL url = CoverageImport1TestBlam.class.getResource(PATH + filename);

             CoverageUnit coverageUnit = SampleJavaFileParser.createCodeUnit(url);

             String namespace = coverageUnit.getNamespace().replaceFirst("org.eclipse.osee.coverage.test.import1.", "");

             coverageUnit.setNamespace(namespace);

diff --git a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/navigate/CoverageTestNavigateViews.java b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/navigate/CoverageTestNavigateViews.java
index 3e85175c265..30ba6d0095c 100644
--- a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/navigate/CoverageTestNavigateViews.java
+++ b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/navigate/CoverageTestNavigateViews.java
@@ -14,13 +14,14 @@ import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.osee.coverage.internal.Activator;
 import org.eclipse.osee.coverage.navigate.ICoverageNavigateItem;
-import org.eclipse.osee.coverage.test.import1.CoverageImport1TestNavigateItem;
+import org.eclipse.osee.coverage.test.import1.CoverageImport1TestBlam;
 import org.eclipse.osee.coverage.test.import1.CoveragePackage1Import1;
 import org.eclipse.osee.coverage.test.import1.CoveragePackage1Import1B;
-import org.eclipse.osee.coverage.test.import2.CoverageImport2TestNavigateItem;
+import org.eclipse.osee.coverage.test.import2.CoverageImport2TestBlam;
 import org.eclipse.osee.coverage.test.import2.CoveragePackage1Import2;
-import org.eclipse.osee.coverage.test.import3.CoverageImport3TestNavigateItem;
+import org.eclipse.osee.coverage.test.import3.CoverageImport3TestBlam;
 import org.eclipse.osee.coverage.test.package1.CoveragePackage1;
+import org.eclipse.osee.coverage.test.util.CoverageImportTestNavigateItem;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItem;
 
@@ -41,9 +42,9 @@ public class CoverageTestNavigateViews implements ICoverageNavigateItem {
          return items;
       }
 
-      items.add(new CoverageImport1TestNavigateItem(null));
-      items.add(new CoverageImport2TestNavigateItem(null));
-      items.add(new CoverageImport3TestNavigateItem(null));
+      items.add(new CoverageImportTestNavigateItem(null, new CoverageImport1TestBlam()));
+      items.add(new CoverageImportTestNavigateItem(null, new CoverageImport2TestBlam()));
+      items.add(new CoverageImportTestNavigateItem(null, new CoverageImport3TestBlam()));
       items.add(new CoveragePackage1(null));
       items.add(new CoveragePackage1Import1(null));
       items.add(new CoveragePackage1Import1B(null));
diff --git a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CoverageImportTestBlam.java b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CoverageImportTestBlam.java
new file mode 100644
index 00000000000..6e8909dd7bc
--- /dev/null
+++ b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CoverageImportTestBlam.java
@@ -0,0 +1,112 @@
+/*******************************************************************************

+ * Copyright (c) 2004, 2007 Boeing.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *     Boeing - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.osee.coverage.test.util;

+

+import java.net.URL;

+import java.util.Arrays;

+import java.util.Collection;

+import java.util.List;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.osee.coverage.ICoverageImporter;

+import org.eclipse.osee.coverage.blam.AbstractCoverageBlam;

+import org.eclipse.osee.coverage.internal.Activator;

+import org.eclipse.osee.coverage.model.CoverageImport;

+import org.eclipse.osee.coverage.model.CoverageUnit;

+import org.eclipse.osee.coverage.test.SampleJavaFileParser;

+import org.eclipse.osee.coverage.test.import1.CoverageImport1TestBlam;

+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.skynet.core.artifact.Artifact;

+import org.eclipse.osee.framework.ui.plugin.util.Displays;

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

+import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;

+import org.eclipse.osee.framework.ui.skynet.widgets.XModifiedListener;

+import org.eclipse.osee.framework.ui.skynet.widgets.XWidget;

+import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayout;

+import org.eclipse.ui.forms.widgets.FormToolkit;

+

+/**

+ * @author Donald G. Dunne

+ */

+public class CoverageImportTestBlam extends AbstractCoverageBlam implements ICoverageImporter {

+

+   public static String COVERAGE_IMPORT_DIR = "Coverage Import Directory";

+   private final String name;

+   private final List<String> fileList;

+   public static String PATH = "../../../../../../../src/org/eclipse/osee/coverage/test/";

+

+   public CoverageImportTestBlam(String name, List<String> fileList) {

+      this.name = name;

+      this.fileList = fileList;

+   }

+

+   @Override

+   public String getName() {

+      return name;

+   }

+

+   @Override

+   public void widgetCreated(XWidget xWidget, FormToolkit toolkit, Artifact art, DynamicXWidgetLayout dynamicXWidgetLayout, XModifiedListener modListener, boolean isEditable) throws OseeCoreException {

+      super.widgetCreated(xWidget, toolkit, art, dynamicXWidgetLayout, modListener, isEditable);

+   }

+

+   @Override

+   public String getXWidgetsXml() {

+      return XWidgetParser.EMPTY_WIDGETS;

+   }

+

+   @Override

+   public String getDescriptionUsage() {

+      return "Import from test area.";

+   }

+

+   @Override

+   public void runOperation(final VariableMap variableMap, IProgressMonitor monitor) throws Exception {

+      final ICoverageImporter importer = this;

+      Displays.ensureInDisplayThread(new Runnable() {

+         public void run() {

+            setCoverageImport(importer.run());

+         };

+      });

+   }

+

+   @Override

+   public Collection<String> getCategories() {

+      return Arrays.asList("ATS");

+   }

+

+   @Override

+   public CoverageImport run() {

+

+      CoverageImport coverageImport = new CoverageImport(getName());

+      try {

+         for (String filename : fileList) {

+            System.err.println(String.format("Importing [%s]", PATH + filename));

+            URL url = CoverageImport1TestBlam.class.getResource(PATH + filename);

+            CoverageUnit coverageUnit = SampleJavaFileParser.createCodeUnit(url);

+            String namespace = coverageUnit.getNamespace().replaceFirst("org.eclipse.osee.coverage.test.import..", "");

+            coverageUnit.setNamespace(namespace);

+            CoverageUnit parentCoverageUnit = coverageImport.getOrCreateParent(namespace);

+            if (parentCoverageUnit != null) {

+               parentCoverageUnit.addCoverageUnit(coverageUnit);

+            } else {

+               coverageImport.addCoverageUnit(coverageUnit);

+            }

+         }

+         coverageImport.setLocation(PATH);

+      } catch (OseeCoreException ex) {

+         OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);

+      }

+      return coverageImport;

+   }

+

+}
\ No newline at end of file
diff --git a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CoverageImportTestNavigateItem.java b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CoverageImportTestNavigateItem.java
new file mode 100644
index 00000000000..8a713decc05
--- /dev/null
+++ b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CoverageImportTestNavigateItem.java
@@ -0,0 +1,36 @@
+/*******************************************************************************

+ * Copyright (c) 2004, 2007 Boeing.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *     Boeing - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.osee.coverage.test.util;

+

+import org.eclipse.osee.coverage.CoverageManager;

+import org.eclipse.osee.coverage.ICoverageImporter;

+import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItem;

+import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItemAction;

+import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateComposite.TableLoadOption;

+

+/**

+ * @author Donald G. Dunne

+ */

+public class CoverageImportTestNavigateItem extends XNavigateItemAction {

+

+   private final ICoverageImporter coverageImporter;

+

+   public CoverageImportTestNavigateItem(XNavigateItem parent, ICoverageImporter coverageImporter) {

+      super(parent, coverageImporter.getName());

+      this.coverageImporter = coverageImporter;

+   }

+

+   @Override

+   public void run(TableLoadOption... tableLoadOptions) throws Exception {

+      CoverageManager.importCoverage(coverageImporter);

+   }

+

+}

diff --git a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CpCreateAndImportItem.java b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CpCreateAndImportItem.java
new file mode 100644
index 00000000000..a09011cb5e6
--- /dev/null
+++ b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CpCreateAndImportItem.java
@@ -0,0 +1,55 @@
+/*******************************************************************************

+ * Copyright (c) 2004, 2007 Boeing.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *     Boeing - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.osee.coverage.test.util;

+

+import org.eclipse.osee.coverage.editor.CoverageEditor;

+import org.eclipse.osee.coverage.editor.CoverageEditorInput;

+import org.eclipse.osee.coverage.model.CoveragePackage;

+import org.eclipse.osee.framework.skynet.core.utility.IncrementingNum;

+import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;

+import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItem;

+import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItemAction;

+import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateComposite.TableLoadOption;

+

+/**

+ * @author Donald G. Dunne

+ */

+public class CpCreateAndImportItem extends XNavigateItemAction {

+

+   private final String blamImportName;

+

+   public CpCreateAndImportItem(XNavigateItem parent, String name, String blamImportName) {

+      super(parent, name);

+      this.blamImportName = blamImportName;

+   }

+

+   @Override

+   public void run(TableLoadOption... tableLoadOptions) throws Exception {

+      CoveragePackage coveragePackage = new CoveragePackage(getName() + " - #" + IncrementingNum.get());

+      CoverageEditor.open(new CoverageEditorInput(coveragePackage));

+      // Process Import 1

+      CoverageEditor editor = null;

+      for (CoverageEditor coverageEditor : CoverageEditor.getEditors()) {

+         if (coverageEditor.getCoverageEditorInput().getCoveragePackageBase() instanceof CoveragePackage) {

+            CoveragePackage editorPackage =

+                  (CoveragePackage) coverageEditor.getCoverageEditorInput().getCoveragePackageBase();

+            if (editorPackage.getGuid().equals(coveragePackage.getGuid())) {

+               editor = coverageEditor;

+            }

+         }

+      }

+      if (editor == null) {

+         AWorkbench.popup("Can't access opened Editor");

+         return;

+      }

+      editor.simulateImport(blamImportName);

+   }

+}

diff --git a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CpSelectAndImportItem.java b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CpSelectAndImportItem.java
new file mode 100644
index 00000000000..045bb6f0ff4
--- /dev/null
+++ b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CpSelectAndImportItem.java
@@ -0,0 +1,62 @@
+/*******************************************************************************

+ * Copyright (c) 2004, 2007 Boeing.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *     Boeing - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.osee.coverage.test.util;

+

+import org.eclipse.osee.coverage.editor.CoverageEditor;

+import org.eclipse.osee.coverage.editor.CoverageEditorInput;

+import org.eclipse.osee.coverage.model.CoveragePackage;

+import org.eclipse.osee.coverage.store.OseeCoveragePackageStore;

+import org.eclipse.osee.coverage.util.dialog.CoveragePackageArtifactListDialog;

+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;

+import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;

+import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItem;

+import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItemAction;

+import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateComposite.TableLoadOption;

+

+/**

+ * @author Donald G. Dunne

+ */

+public class CpSelectAndImportItem extends XNavigateItemAction {

+

+   private final String blamImportName;

+

+   public CpSelectAndImportItem(XNavigateItem parent, String name, String blamImportName) {

+      super(parent, name);

+      this.blamImportName = blamImportName;

+   }

+

+   @Override

+   public void run(TableLoadOption... tableLoadOptions) throws Exception {

+      CoveragePackageArtifactListDialog dialog =

+            new CoveragePackageArtifactListDialog("Open Coverage Package", "Select Coverage Package");

+      dialog.setInput(OseeCoveragePackageStore.getCoveragePackageArtifacts());

+      if (dialog.open() != 0) return;

+      Artifact coveragePackageArtifact = (Artifact) dialog.getResult()[0];

+      CoveragePackage coveragePackage = OseeCoveragePackageStore.get(coveragePackageArtifact);

+      CoverageEditor.open(new CoverageEditorInput(coveragePackage));

+      // Process Import 1

+      CoverageEditor editor = null;

+      for (CoverageEditor coverageEditor : CoverageEditor.getEditors()) {

+         if (coverageEditor.getCoverageEditorInput().getCoveragePackageBase() instanceof CoveragePackage) {

+            CoveragePackage editorPackage =

+                  (CoveragePackage) coverageEditor.getCoverageEditorInput().getCoveragePackageBase();

+            if (editorPackage.getGuid().equals(coveragePackage.getGuid())) {

+               editor = coverageEditor;

+            }

+         }

+      }

+      if (editor == null) {

+         AWorkbench.popup("Can't access opened Editor");

+         return;

+      }

+      editor.simulateImport(blamImportName);

+   }

+}

diff --git a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/ICoverageImporter.java b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/ICoverageImporter.java
index 89a02ed73c5..4d0566752cb 100644
--- a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/ICoverageImporter.java
+++ b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/ICoverageImporter.java
@@ -17,5 +17,7 @@ import org.eclipse.osee.coverage.model.CoverageImport;
  */

 public interface ICoverageImporter {

 

+   public String getName();

+

    public CoverageImport run();

 }

diff --git a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VectorCastAdaCoverageImporter.java b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VectorCastAdaCoverageImporter.java
index 157465b71e5..16b8e508a26 100644
--- a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VectorCastAdaCoverageImporter.java
+++ b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VectorCastAdaCoverageImporter.java
@@ -141,4 +141,9 @@ public class VectorCastAdaCoverageImporter implements ICoverageImporter {
       return coverageImport;

    }

 

+   @Override

+   public String getName() {

+      return "VectorCast Import";

+   }

+

 }