Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorddunne2009-11-10 18:48:55 +0000
committerddunne2009-11-10 18:48:55 +0000
commitf017f28496c2711f8c4e3bfc42a8ebee76cb7a74 (patch)
tree57c13ed214b2c51ab75145530c9f21e1f985de5a
parent916d047f96c7f2539e732cee1c97d2d126d14e6c (diff)
downloadorg.eclipse.osee-f017f28496c2711f8c4e3bfc42a8ebee76cb7a74.tar.gz
org.eclipse.osee-f017f28496c2711f8c4e3bfc42a8ebee76cb7a74.tar.xz
org.eclipse.osee-f017f28496c2711f8c4e3bfc42a8ebee76cb7a74.zip
code coverage
-rw-r--r--org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageItemPersistTest.java2
-rw-r--r--org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageUnitPersistTest.java2
-rw-r--r--org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/package1/CoveragePackage1.java2
-rw-r--r--org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CpCreateAndImportItem.java2
-rw-r--r--org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CpSelectAndImportItem.java2
-rw-r--r--org.eclipse.osee.coverage/plugin.xml50
-rw-r--r--org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/CoverageManager.java2
-rw-r--r--org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoverUnitAction.java4
-rw-r--r--org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoveragePackageAction.java6
-rw-r--r--org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/NewCoveragePackageAction.java20
-rw-r--r--org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/OpenCoveragePackageAction.java4
-rw-r--r--org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorHandler.java38
-rw-r--r--org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorInput.java9
-rw-r--r--org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorMergeTab.java18
-rw-r--r--org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageRenderer.java91
-rw-r--r--org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/CoverageNavigateView.java43
-rw-r--r--org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageArtifactImageProvider.java29
-rw-r--r--org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoveragePackageStore.java5
-rw-r--r--org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageStore.java8
-rw-r--r--org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/CoverageUtil.java33
-rw-r--r--org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java2
-rw-r--r--org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dialogs/ArtifactSelectionDialog.java2
-rw-r--r--org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java2
-rw-r--r--org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java4
-rw-r--r--org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidget.java12
-rw-r--r--org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidgetProvider.java2
-rw-r--r--org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/importer/OutfileImportPage.java2
27 files changed, 346 insertions, 50 deletions
diff --git a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageItemPersistTest.java b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageItemPersistTest.java
index bfdfc8ca037..69079e10f7a 100644
--- a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageItemPersistTest.java
+++ b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageItemPersistTest.java
@@ -14,6 +14,7 @@ import org.eclipse.osee.coverage.util.CoverageUtil;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.junit.AfterClass;
@@ -34,6 +35,7 @@ public class CoverageItemPersistTest {
@BeforeClass
@AfterClass
public static void testCleanup() throws OseeCoreException {
+ CoverageUtil.setBranch(BranchManager.getCommonBranch());
CoverageTestUtil.cleanupCoverageTests();
}
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 4570dbb3146..1371ae640a5 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
@@ -28,6 +28,7 @@ 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.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.ui.plugin.util.Result;
import org.junit.AfterClass;
@@ -51,6 +52,7 @@ public class CoverageUnitPersistTest {
@BeforeClass
@AfterClass
public static void testCleanup() throws OseeCoreException {
+ CoverageUtil.setBranch(BranchManager.getCommonBranch());
CoverageTestUtil.cleanupCoverageTests();
}
diff --git a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/package1/CoveragePackage1.java b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/package1/CoveragePackage1.java
index c6a467536f1..bb072caac11 100644
--- a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/package1/CoveragePackage1.java
+++ b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/package1/CoveragePackage1.java
@@ -33,6 +33,6 @@ public class CoveragePackage1 extends XNavigateItemAction {
@Override
public void run(TableLoadOption... tableLoadOptions) throws Exception {
CoveragePackage coveragePackage = new CoveragePackage("Coverage Package 1");
- CoverageEditor.open(new CoverageEditorInput(coveragePackage));
+ CoverageEditor.open(new CoverageEditorInput(null, coveragePackage));
}
}
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
index c84ab216442..30836b35066 100644
--- 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
@@ -35,7 +35,7 @@ public class CpCreateAndImportItem extends XNavigateItemAction {
@Override
public void run(TableLoadOption... tableLoadOptions) throws Exception {
coveragePackage = new CoveragePackage(getName() + " - #" + IncrementingNum.get());
- CoverageEditor.open(new CoverageEditorInput(coveragePackage));
+ CoverageEditor.open(new CoverageEditorInput(null, coveragePackage));
// Process Import 1
CoverageEditor editor = null;
for (CoverageEditor coverageEditor : CoverageEditor.getEditors()) {
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
index 045bb6f0ff4..131073d7e4c 100644
--- 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
@@ -41,7 +41,7 @@ public class CpSelectAndImportItem extends XNavigateItemAction {
if (dialog.open() != 0) return;
Artifact coveragePackageArtifact = (Artifact) dialog.getResult()[0];
CoveragePackage coveragePackage = OseeCoveragePackageStore.get(coveragePackageArtifact);
- CoverageEditor.open(new CoverageEditorInput(coveragePackage));
+ CoverageEditor.open(new CoverageEditorInput(coveragePackageArtifact, coveragePackage));
// Process Import 1
CoverageEditor editor = null;
for (CoverageEditor coverageEditor : CoverageEditor.getEditors()) {
diff --git a/org.eclipse.osee.coverage/plugin.xml b/org.eclipse.osee.coverage/plugin.xml
index 4300f0c7f97..2f366309bb2 100644
--- a/org.eclipse.osee.coverage/plugin.xml
+++ b/org.eclipse.osee.coverage/plugin.xml
@@ -55,18 +55,60 @@
id="org.eclipse.osee.coverage.navigate.CoverageNavigateView"
name="Coverage Navigator"/>
</extension>
- <extension
+ <extension
point="org.eclipse.osee.framework.ui.skynet.XWidgetProvider">
<XWidgetProvider
classname="org.eclipse.osee.coverage.util.widget.CoverageXWidgetFactory">
</XWidgetProvider>
- </extension>
- <extension
+ </extension>
+ <extension
id="OseeTypes_Coverage"
name="OseeTypes_Coverage"
point="org.eclipse.osee.framework.skynet.core.OseeTypes">
<OseeTypes
resource="support/OseeTypes_Coverage.osee">
</OseeTypes>
- </extension>
+ </extension>
+ <extension
+ point="org.eclipse.osee.framework.ui.skynet.ArtifactImageProvider">
+ <ArtifactImageProvider
+ class="org.eclipse.osee.coverage.store.CoverageArtifactImageProvider">
+ </ArtifactImageProvider>
+ </extension>
+ <extension
+ point="org.eclipse.ui.commandImages">
+ <image
+ commandId="org.eclipse.osee.coverage.editor.command"
+ icon="images/coveragePackage.gif">
+ </image>
+ </extension>
+ <extension
+ point="org.eclipse.ui.commands">
+ <command
+ id="org.eclipse.osee.coverage.editor.command"
+ name="Coverage Editor">
+ </command>
+ </extension>
+ <extension
+ point="org.eclipse.ui.handlers">
+ <handler
+ class="org.eclipse.osee.coverage.editor.CoverageEditorHandler"
+ commandId="org.eclipse.osee.coverage.editor.command">
+ <enabledWhen>
+ <with
+ variable="selection">
+ <count
+ value="+">
+ </count>
+ </with>
+ </enabledWhen>
+ </handler>
+ </extension>
+ <extension
+ point="org.eclipse.osee.framework.ui.skynet.ArtifactRenderer">
+ <Renderer
+ classname="org.eclipse.osee.coverage.editor.CoverageRenderer">
+ </Renderer>
+ </extension>
+
</plugin>
diff --git a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/CoverageManager.java b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/CoverageManager.java
index 0396fd708dd..d54845d9cf5 100644
--- a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/CoverageManager.java
+++ b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/CoverageManager.java
@@ -28,7 +28,7 @@ public class CoverageManager {
public static void importCoverage(ICoverageImporter coverageImporter) throws OseeCoreException {
CoverageImport coverageImport = coverageImporter.run();
- CoverageEditor.open(new CoverageEditorInput(coverageImport));
+ CoverageEditor.open(new CoverageEditorInput(null, coverageImport));
}
public static Collection<AbstractCoverageBlam> getCoverageBlams() {
diff --git a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoverUnitAction.java b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoverUnitAction.java
index c85b6858793..cb6abaff093 100644
--- a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoverUnitAction.java
+++ b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoverUnitAction.java
@@ -15,11 +15,11 @@ import org.eclipse.osee.coverage.model.CoverageUnit;
import org.eclipse.osee.coverage.model.ICoverage;
import org.eclipse.osee.coverage.model.ICoverageUnitProvider;
import org.eclipse.osee.coverage.store.OseeCoverageStore;
+import org.eclipse.osee.coverage.util.CoverageUtil;
import org.eclipse.osee.coverage.util.ISaveable;
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.BranchManager;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.plugin.util.Result;
@@ -68,7 +68,7 @@ public class DeleteCoverUnitAction extends Action {
"Delete Coverage Units")) {
try {
SkynetTransaction transaction =
- new SkynetTransaction(BranchManager.getCommonBranch(), "Coverage - Delete Coverage Unit");
+ new SkynetTransaction(CoverageUtil.getBranch(), "Coverage - Delete Coverage Unit");
List<ICoverage> deleteItems = new ArrayList<ICoverage>();
for (ICoverage coverageItem : selectedCoverageEditorItem.getSelectedCoverageEditorItems()) {
if (coverageItem.getParent() instanceof ICoverageUnitProvider) {
diff --git a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoveragePackageAction.java b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoveragePackageAction.java
index 538d06f35e3..863804d12c4 100644
--- a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoveragePackageAction.java
+++ b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoveragePackageAction.java
@@ -11,12 +11,12 @@ import org.eclipse.osee.coverage.internal.Activator;
import org.eclipse.osee.coverage.model.CoveragePackage;
import org.eclipse.osee.coverage.store.OseeCoveragePackageStore;
import org.eclipse.osee.coverage.store.OseeCoverageStore;
+import org.eclipse.osee.coverage.util.CoverageUtil;
import org.eclipse.osee.coverage.util.dialog.CoveragePackageArtifactListDialog;
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.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
import org.eclipse.osee.framework.ui.skynet.ImageManager;
@@ -42,6 +42,7 @@ public class DeleteCoveragePackageAction extends Action {
@Override
public void run() {
try {
+ if (!CoverageUtil.getBranchFromUser(false)) return;
CoveragePackageArtifactListDialog dialog =
new CoveragePackageArtifactListDialog("Delete Package", "Select Package");
dialog.setInput(OseeCoveragePackageStore.getCoveragePackageArtifacts());
@@ -57,8 +58,7 @@ public class DeleteCoveragePackageAction extends Action {
if (cDialog.open() == 0) {
boolean purge = cDialog.isChecked();
SkynetTransaction transaction = null;
- if (!purge) transaction =
- new SkynetTransaction(BranchManager.getCommonBranch(), "Delete Coverage Package");
+ if (!purge) transaction = new SkynetTransaction(CoverageUtil.getBranch(), "Delete Coverage Package");
OseeCoverageStore.get(coveragePackage).delete(transaction, purge);
if (!purge) transaction.execute();
}
diff --git a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/NewCoveragePackageAction.java b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/NewCoveragePackageAction.java
index ef42429a5d7..996f4bb36f2 100644
--- a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/NewCoveragePackageAction.java
+++ b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/NewCoveragePackageAction.java
@@ -13,10 +13,10 @@ import org.eclipse.osee.coverage.internal.Activator;
import org.eclipse.osee.coverage.model.CoveragePackage;
import org.eclipse.osee.coverage.store.OseeCoverageStore;
import org.eclipse.osee.coverage.util.CoverageImage;
+import org.eclipse.osee.coverage.util.CoverageUtil;
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.BranchManager;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.ui.skynet.ImageManager;
import org.eclipse.osee.framework.ui.skynet.OseeImage;
@@ -40,19 +40,19 @@ public class NewCoveragePackageAction extends Action {
@Override
public void run() {
- EntryDialog dialog = new EntryDialog(getText(), "Enter Coverage Package Name");
- if (dialog.open() == 0) {
- try {
+ try {
+ if (!CoverageUtil.getBranchFromUser(false)) return;
+ EntryDialog dialog = new EntryDialog(getText(), "Enter Coverage Package Name");
+ if (dialog.open() == 0) {
CoveragePackage coveragePackage = new CoveragePackage(dialog.getEntry());
- SkynetTransaction transaction =
- new SkynetTransaction(BranchManager.getCommonBranch(), "Add Coverage Package");
+ SkynetTransaction transaction = new SkynetTransaction(CoverageUtil.getBranch(), "Add Coverage Package");
OseeCoverageStore.get(coveragePackage).save(transaction);
transaction.execute();
- CoverageEditor.open(new CoverageEditorInput(coveragePackage));
- } catch (OseeCoreException ex) {
- OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
+ CoverageEditor.open(new CoverageEditorInput(OseeCoverageStore.get(coveragePackage).getArtifact(false),
+ coveragePackage));
}
-
+ } catch (OseeCoreException ex) {
+ OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
}
}
}
diff --git a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/OpenCoveragePackageAction.java b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/OpenCoveragePackageAction.java
index c25c55a1ece..b6231426d1f 100644
--- a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/OpenCoveragePackageAction.java
+++ b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/OpenCoveragePackageAction.java
@@ -13,6 +13,7 @@ import org.eclipse.osee.coverage.internal.Activator;
import org.eclipse.osee.coverage.model.CoveragePackage;
import org.eclipse.osee.coverage.store.OseeCoveragePackageStore;
import org.eclipse.osee.coverage.util.CoverageImage;
+import org.eclipse.osee.coverage.util.CoverageUtil;
import org.eclipse.osee.coverage.util.dialog.CoveragePackageArtifactListDialog;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLevel;
@@ -40,13 +41,14 @@ public class OpenCoveragePackageAction extends Action {
@Override
public void run() {
try {
+ if (!CoverageUtil.getBranchFromUser(false)) return;
CoveragePackageArtifactListDialog dialog =
new CoveragePackageArtifactListDialog("Open Coverage Package", "Select Coverage Package");
dialog.setInput(OseeCoveragePackageStore.getCoveragePackageArtifacts());
if (dialog.open() == 0) {
Artifact coveragePackageArtifact = (Artifact) dialog.getResult()[0];
CoveragePackage coveragePackage = OseeCoveragePackageStore.get(coveragePackageArtifact);
- CoverageEditor.open(new CoverageEditorInput(coveragePackage));
+ CoverageEditor.open(new CoverageEditorInput(coveragePackageArtifact, coveragePackage));
}
} catch (OseeCoreException ex) {
OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
diff --git a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorHandler.java b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorHandler.java
new file mode 100644
index 00000000000..42ba71cae59
--- /dev/null
+++ b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorHandler.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * 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.editor;
+
+import java.util.logging.Level;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.logging.OseeLog;
+import org.eclipse.osee.framework.ui.skynet.commandHandlers.renderer.handlers.AbstractEditorHandler;
+
+/**
+ * @author Donald G. Dunne
+ */
+public class CoverageEditorHandler extends AbstractEditorHandler {
+
+ @Override
+ public Object execute(ExecutionEvent event) throws ExecutionException {
+ if (!artifacts.isEmpty()) {
+ CoverageRenderer renderer = new CoverageRenderer();
+ try {
+ renderer.open(artifacts);
+ } catch (OseeCoreException ex) {
+ OseeLog.log(CoverageEditorHandler.class, Level.SEVERE, ex);
+ }
+ dispose();
+ }
+ 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 4fada7681db..d068ae93672 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
@@ -12,6 +12,7 @@ package org.eclipse.osee.coverage.editor;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.osee.coverage.model.CoveragePackageBase;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IPersistableElement;
@@ -21,8 +22,10 @@ import org.eclipse.ui.IPersistableElement;
public class CoverageEditorInput implements IEditorInput {
private final CoveragePackageBase coveragePackageBase;
+ private final Artifact coveragePackageArtifact;
- public CoverageEditorInput(CoveragePackageBase coveragePackageBase) {
+ public CoverageEditorInput(Artifact coveragePackageArtifact, CoveragePackageBase coveragePackageBase) {
+ this.coveragePackageArtifact = coveragePackageArtifact;
this.coveragePackageBase = coveragePackageBase;
}
@@ -57,4 +60,8 @@ public class CoverageEditorInput implements IEditorInput {
return coveragePackageBase;
}
+ public Artifact getCoveragePackageArtifact() {
+ return coveragePackageArtifact;
+ }
+
}
diff --git a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorMergeTab.java b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorMergeTab.java
index 212db765532..0ba4f6c0430 100644
--- a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorMergeTab.java
+++ b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorMergeTab.java
@@ -30,12 +30,14 @@ import org.eclipse.osee.coverage.model.CoveragePackage;
import org.eclipse.osee.coverage.store.OseeCoverageStore;
import org.eclipse.osee.coverage.util.CoverageImage;
import org.eclipse.osee.coverage.util.CoveragePackageImportManager;
+import org.eclipse.osee.coverage.util.CoverageUtil;
import org.eclipse.osee.coverage.util.ISaveable;
import org.eclipse.osee.coverage.util.NotSaveable;
import org.eclipse.osee.coverage.util.widget.XHyperlabelCoverageMethodSelection;
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.AWorkbench;
import org.eclipse.osee.framework.ui.plugin.util.Result;
import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
@@ -243,8 +245,20 @@ public class CoverageEditorMergeTab extends FormPage implements ISaveable {
@Override
public void run() {
- handleImportSelected();
- loadImportViewer(true);
+ try {
+ Artifact artifact = ((CoverageEditorInput) coverageEditor.getEditorInput()).getCoveragePackageArtifact();
+ if (artifact != null) {
+ CoverageUtil.setBranch(artifact.getBranch());
+ } else {
+ if (!CoverageUtil.getBranchFromUser(true)) {
+ return;
+ }
+ }
+ handleImportSelected();
+ loadImportViewer(true);
+ } catch (OseeCoreException ex) {
+ OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
+ }
}
public org.eclipse.jface.resource.ImageDescriptor getImageDescriptor() {
diff --git a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageRenderer.java b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageRenderer.java
new file mode 100644
index 00000000000..db856cbdb88
--- /dev/null
+++ b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageRenderer.java
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * 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.editor;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.eclipse.osee.coverage.store.OseeCoveragePackageStore;
+import org.eclipse.osee.coverage.util.CoverageImage;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+import org.eclipse.osee.framework.ui.skynet.ImageManager;
+import org.eclipse.osee.framework.ui.skynet.render.DefaultArtifactRenderer;
+import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * @author Ryan D. Brooks
+ */
+public class CoverageRenderer extends DefaultArtifactRenderer {
+ private static final String COMMAND_ID = "org.eclipse.osee.coverage.editor.command";
+
+ @Override
+ public List<String> getCommandId(PresentationType presentationType) {
+ ArrayList<String> commandIds = new ArrayList<String>(1);
+
+ if (presentationType == PresentationType.SPECIALIZED_EDIT) {
+ commandIds.add(COMMAND_ID);
+ }
+
+ return commandIds;
+ }
+
+ @Override
+ public Image getImage(Artifact artifact) throws OseeCoreException {
+ return ImageManager.getImage(CoverageImage.COVERAGE_PACKAGE);
+ }
+
+ @Override
+ public String getName() {
+ return "Coverage Editor";
+ }
+
+ public CoverageRenderer() {
+ super();
+ }
+
+ @Override
+ public void open(List<Artifact> artifacts) throws OseeCoreException {
+ for (Artifact artifact : artifacts) {
+ if (artifact.getArtifactTypeName().equals(OseeCoveragePackageStore.ARTIFACT_NAME)) {
+ CoverageEditor.open(new CoverageEditorInput(artifact, OseeCoveragePackageStore.get(artifact)));
+ }
+ }
+ }
+
+ @Override
+ public CoverageRenderer newInstance() throws OseeCoreException {
+ return new CoverageRenderer();
+ }
+
+ @Override
+ public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) {
+ if (artifact.getArtifactTypeName().equals(OseeCoveragePackageStore.ARTIFACT_NAME) && (!artifact.isHistorical())) {
+ return PRESENTATION_SUBTYPE_MATCH;
+ }
+ return NO_MATCH;
+ }
+
+ @Override
+ public void preview(List<Artifact> artifacts) throws OseeCoreException {
+ open(artifacts);
+ }
+
+ @Override
+ public int minimumRanking() throws OseeCoreException {
+ if (AccessControlManager.isOseeAdmin()) {
+ return NO_MATCH;
+ } else {
+ return PRESENTATION_TYPE;
+ }
+ }
+}
diff --git a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/CoverageNavigateView.java b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/CoverageNavigateView.java
index c636631dce4..1ee37060871 100644
--- a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/CoverageNavigateView.java
+++ b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/CoverageNavigateView.java
@@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.coverage.navigate;
+import java.util.logging.Level;
import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.IExtensionRegistry;
@@ -18,15 +19,22 @@ import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.osee.coverage.internal.Activator;
+import org.eclipse.osee.coverage.util.CoverageUtil;
+import org.eclipse.osee.framework.logging.OseeLog;
+import org.eclipse.osee.framework.skynet.core.artifact.Branch;
import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
import org.eclipse.osee.framework.ui.skynet.ImageManager;
import org.eclipse.osee.framework.ui.skynet.ats.IActionable;
import org.eclipse.osee.framework.ui.skynet.ats.OseeAts;
+import org.eclipse.osee.framework.ui.skynet.widgets.XBranchSelectWidget;
import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateComposite;
import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItem;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
import org.eclipse.ui.part.ViewPart;
/**
@@ -36,6 +44,7 @@ public class CoverageNavigateView extends ViewPart implements IActionable {
public static final String VIEW_ID = "org.eclipse.osee.coverage.navigate.CoverageNavigateView";
private XNavigateComposite xNavComp;
+ private XBranchSelectWidget xBranchSelectWidget;
public CoverageNavigateView() {
}
@@ -46,7 +55,37 @@ public class CoverageNavigateView extends ViewPart implements IActionable {
@Override
public void createPartControl(Composite parent) {
- xNavComp = new XNavigateComposite(new CoverageNavigateViewItems(), parent, SWT.NONE);
+
+ Composite comp = new Composite(parent, SWT.None);
+ comp.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false));
+
+ xBranchSelectWidget = new XBranchSelectWidget("");
+ xBranchSelectWidget.setDisplayLabel(false);
+ if (CoverageUtil.getBranch() != null) {
+ xBranchSelectWidget.setSelection(CoverageUtil.getBranch());
+ }
+ xBranchSelectWidget.createWidgets(comp, 1);
+ xBranchSelectWidget.addListener(new Listener() {
+ @Override
+ public void handleEvent(Event event) {
+ try {
+ Branch selectedBranch = xBranchSelectWidget.getData();
+ if (selectedBranch != null) {
+ CoverageUtil.setBranch(selectedBranch);
+ }
+ } catch (Exception ex) {
+ OseeLog.log(getClass(), Level.SEVERE, ex);
+ }
+ }
+
+ });
+ CoverageUtil.addBranchChangeListener(new Listener() {
+ @Override
+ public void handleEvent(Event event) {
+ xBranchSelectWidget.setSelection(CoverageUtil.getBranch());
+ }
+ });
+ xNavComp = new XNavigateComposite(new CoverageNavigateViewItems(), comp, SWT.NONE);
createActions();
xNavComp.refresh();
@@ -89,6 +128,7 @@ public class CoverageNavigateView extends ViewPart implements IActionable {
};
refreshAction.setImageDescriptor(ImageManager.getImageDescriptor(FrameworkImage.REFRESH));
refreshAction.setToolTipText("Refresh");
+ getViewSite().getActionBars().getMenuManager().add(refreshAction);
OseeAts.addBugToViewToolbar(this, this, Activator.getInstance(), VIEW_ID, "Coverage Navigator");
@@ -108,4 +148,5 @@ public class CoverageNavigateView extends ViewPart implements IActionable {
}
});
}
+
} \ No newline at end of file
diff --git a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageArtifactImageProvider.java b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageArtifactImageProvider.java
new file mode 100644
index 00000000000..9976ccc9ea2
--- /dev/null
+++ b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageArtifactImageProvider.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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.store;
+
+import org.eclipse.osee.coverage.util.CoverageImage;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.ui.skynet.ArtifactImageProvider;
+import org.eclipse.osee.framework.ui.skynet.ImageManager;
+
+/**
+ * @author Ryan D. Brooks
+ */
+public class CoverageArtifactImageProvider extends ArtifactImageProvider {
+
+ @Override
+ public void init() throws OseeCoreException {
+ ImageManager.registerBaseImage(OseeCoveragePackageStore.ARTIFACT_NAME, CoverageImage.COVERAGE_PACKAGE, this);
+ ImageManager.registerBaseImage(OseeCoverageUnitStore.ARTIFACT_NAME, CoverageImage.COVERAGE, this);
+ }
+
+} \ No newline at end of file
diff --git a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoveragePackageStore.java b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoveragePackageStore.java
index dfd692569d4..211be641b5d 100644
--- a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoveragePackageStore.java
+++ b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoveragePackageStore.java
@@ -8,11 +8,11 @@ package org.eclipse.osee.coverage.store;
import java.util.Collection;
import org.eclipse.osee.coverage.model.CoveragePackage;
import org.eclipse.osee.coverage.model.CoverageUnit;
+import org.eclipse.osee.coverage.util.CoverageUtil;
import org.eclipse.osee.coverage.util.ISaveable;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.artifact.GeneralData;
import org.eclipse.osee.framework.skynet.core.artifact.KeyValueArtifact;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
@@ -107,8 +107,7 @@ public class OseeCoveragePackageStore extends OseeCoverageStore implements ISave
}
public static Collection<Artifact> getCoveragePackageArtifacts() throws OseeCoreException {
- return ArtifactQuery.getArtifactListFromType(OseeCoveragePackageStore.ARTIFACT_NAME,
- BranchManager.getCommonBranch());
+ return ArtifactQuery.getArtifactListFromType(OseeCoveragePackageStore.ARTIFACT_NAME, CoverageUtil.getBranch());
}
}
diff --git a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageStore.java b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageStore.java
index 6af65bfcbb5..6cbbea7c279 100644
--- a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageStore.java
+++ b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageStore.java
@@ -18,7 +18,6 @@ import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.skynet.core.artifact.Branch;
-import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.ui.plugin.util.Result;
@@ -71,8 +70,7 @@ public abstract class OseeCoverageStore extends CoverageStore {
}
if (artifact == null && create) {
artifact =
- ArtifactTypeManager.addArtifact(artifactTypeName, BranchManager.getCommonBranch(),
- coverage.getGuid(), null);
+ ArtifactTypeManager.addArtifact(artifactTypeName, CoverageUtil.getBranch(), coverage.getGuid(), null);
}
}
return artifact;
@@ -87,7 +85,7 @@ public abstract class OseeCoverageStore extends CoverageStore {
@Override
public Result save() throws OseeCoreException {
try {
- SkynetTransaction transaction = new SkynetTransaction(BranchManager.getCommonBranch(), "Coverage Save");
+ SkynetTransaction transaction = new SkynetTransaction(CoverageUtil.getBranch(), "Coverage Save");
save(transaction);
transaction.execute();
} catch (OseeCoreException ex) {
@@ -99,7 +97,7 @@ public abstract class OseeCoverageStore extends CoverageStore {
@Override
public void delete(boolean purge) throws OseeCoreException {
- SkynetTransaction transaction = new SkynetTransaction(BranchManager.getCommonBranch(), "Coverage Save");
+ SkynetTransaction transaction = new SkynetTransaction(CoverageUtil.getBranch(), "Coverage Save");
delete(transaction, purge);
transaction.execute();
}
diff --git a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/CoverageUtil.java b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/CoverageUtil.java
index 4d64ff59758..fe533b20ebf 100644
--- a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/CoverageUtil.java
+++ b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/CoverageUtil.java
@@ -5,7 +5,9 @@
*/
package org.eclipse.osee.coverage.util;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.List;
import java.util.Set;
import org.eclipse.osee.coverage.internal.Activator;
import org.eclipse.osee.coverage.model.CoverageImport;
@@ -22,18 +24,30 @@ import org.eclipse.osee.framework.skynet.core.artifact.Branch;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.utility.UsersByIds;
import org.eclipse.osee.framework.ui.skynet.OseeImage;
+import org.eclipse.osee.framework.ui.skynet.branch.BranchSelectionDialog;
+import org.eclipse.swt.widgets.Listener;
/**
* @author Donald G. Dunne
*/
public class CoverageUtil {
+ private static Branch branch = null;
+ private static List<Listener> branchChangeListeners = new ArrayList<Listener>();
+
public static String getCoverageItemUsersStr(ICoverage coverageItem) {
return Collections.toString(getCoverageItemUsers(coverageItem), "; ");
}
- public static Branch getBranch() throws OseeCoreException {
- return BranchManager.getCommonBranch();
+ public static boolean getBranchFromUser(boolean force) throws OseeCoreException {
+ if (force || CoverageUtil.getBranch() == null) {
+ BranchSelectionDialog dialog = new BranchSelectionDialog("Select Branch", BranchManager.getBaselineBranches());
+ if (dialog.open() != 0) {
+ return false;
+ }
+ CoverageUtil.setBranch(dialog.getSelected());
+ }
+ return true;
}
public static Collection<User> getCoverageItemUsers(ICoverage coverageItem) {
@@ -76,4 +90,19 @@ public class CoverageUtil {
}
}
+ public static Branch getBranch() {
+ return branch;
+ }
+
+ public static void setBranch(Branch branch) {
+ CoverageUtil.branch = branch;
+ for (Listener listener : branchChangeListeners) {
+ listener.handleEvent(null);
+ }
+ }
+
+ public static void addBranchChangeListener(Listener listener) {
+ branchChangeListeners.add(listener);
+ }
+
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java
index f6e83c116e6..cd2b72e4444 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java
@@ -280,7 +280,7 @@ public class ArtifactExplorer extends ViewPart implements IRebuildMenuListener,
branchSelect = new XBranchSelectWidget("");
branchSelect.setDisplayLabel(false);
- branchSelect.setBranch(branch);
+ branchSelect.setSelection(branch);
branchSelect.createWidgets(parent, 1);
branchSelect.addListener(new Listener() {
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dialogs/ArtifactSelectionDialog.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dialogs/ArtifactSelectionDialog.java
index b080a10ee27..cdbbbc2e965 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dialogs/ArtifactSelectionDialog.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dialogs/ArtifactSelectionDialog.java
@@ -74,7 +74,7 @@ public class ArtifactSelectionDialog extends SelectionStatusDialog {
}
public void setBranch(Branch branch) {
- branchSelect.setBranch(branch);
+ branchSelect.setSelection(branch);
}
public Branch getBranch() {
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java
index 10a908c9998..c7ce320e05a 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java
@@ -119,7 +119,7 @@ public class GroupExplorer extends ViewPart implements IFrameworkTransactionEven
branchSelect = new XBranchSelectWidget("");
branchSelect.setDisplayLabel(false);
- branchSelect.setBranch(branch);
+ branchSelect.setSelection(branch);
branchSelect.createWidgets(parent, 1);
branchSelect.addListener(new Listener() {
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java
index 7725bcc44d3..155d2f3bbe8 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java
@@ -114,9 +114,9 @@ public class ArtifactSearchPage extends DialogPage implements ISearchPage, IRepl
branchSelect = new XBranchSelectWidget("Branch To Search");
branchSelect.setDisplayLabel(false);
- branchSelect.setBranch(BranchManager.getLastBranch());
+ branchSelect.setSelection(BranchManager.getLastBranch());
branchSelect.createWidgets(mainComposite, 2);
-
+
addFilterControls(mainComposite);
addTableControls(mainComposite);
addSearchScope(mainComposite);
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidget.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidget.java
index c0d8d13dca0..d3cbd1133a9 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidget.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidget.java
@@ -94,6 +94,10 @@ public class XBranchSelectWidget extends XWidget implements Listener {
@Override
public Branch getData() {
+ return getSelection();
+ }
+
+ public Branch getSelection() {
return selectComposite.getSelectedBranch();
}
@@ -170,10 +174,6 @@ public class XBranchSelectWidget extends XWidget implements Listener {
notifyListeners(event);
}
- public void setBranch(Branch branch) {
- defaultBranch = branch;
- }
-
public void addListener(Listener listener) {
listeners.add(listener);
}
@@ -190,7 +190,9 @@ public class XBranchSelectWidget extends XWidget implements Listener {
public void setSelection(Branch branch) {
defaultBranch = branch;
- selectComposite.setSelected(branch);
+ if (selectComposite != null) {
+ selectComposite.setSelected(branch);
+ }
}
public BranchSelectComposite getSelectComposite() {
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidgetProvider.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidgetProvider.java
index 0629f92ec3a..58bf2567b44 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidgetProvider.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidgetProvider.java
@@ -33,7 +33,7 @@ public class XBranchSelectWidgetProvider implements IXWidgetProvider {
try {
String branchName = widgetLayoutData.getDefaultValue();
if (branchName != null) {
- widget.setBranch(BranchManager.getBranch(branchName));
+ widget.setSelection(BranchManager.getBranch(branchName));
}
} catch (OseeCoreException ex) {
OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
diff --git a/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/importer/OutfileImportPage.java b/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/importer/OutfileImportPage.java
index b6b8b759301..9cb4b3b5243 100644
--- a/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/importer/OutfileImportPage.java
+++ b/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/importer/OutfileImportPage.java
@@ -223,7 +223,7 @@ public class OutfileImportPage extends WizardDataTransferPage {
if (settings != null) {
String lastSelected = settings.get(TestRunStorageKey.SELECTED_BRANCH_ID);
try {
- branchSelect.setBranch(BranchManager.getBranch(Integer.parseInt(lastSelected)));
+ branchSelect.setSelection(BranchManager.getBranch(Integer.parseInt(lastSelected)));
} catch (Exception ex) {
OseeLog.log(OteUiDefinePlugin.class, Level.SEVERE, ex);
}

Back to the top