feature: Convert artifact editor menu item to use single image

9 files changed, 14 insertions, 12 deletions

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java
index 487346a559d..ac6d1a9d8fd 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java
@@ -241,7 +241,7 @@ public final class AtsNavigateViewItems implements XNavigateViewItems {
       new XNavigateItemBlam(utilItems, new ImportActionsViaSpreadsheetBlam());
       new XNavigateItemAction(utilItems, new CompareTwoStringsAction(), FrameworkImage.EDIT);
       new GenerateGuid(utilItems);
-      new XNavigateItemOperation(utilItems, FrameworkImage.GEAR, MassEditDirtyArtifactOperation.NAME,
+      new XNavigateItemOperation(utilItems, FrameworkImage.ARTIFACT_MASS_EDITOR, MassEditDirtyArtifactOperation.NAME,
          new MassEditDirtyArtifactOperation());
       new ClearAtsWorkDefinitionCache(utilItems);
 
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateViewItems.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateViewItems.java
index 1efba6233b4..b06ce61efc4 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateViewItems.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateViewItems.java
@@ -60,8 +60,8 @@ public class DefineNavigateViewItems implements XNavigateViewItems {
 
       addExtensionPointItems(items);
       items.add(new XNavigateItemAction(null, new CompareTwoStringsAction(), FrameworkImage.EDIT));
-      items.add(new XNavigateItemOperation(null, FrameworkImage.GEAR, MassEditDirtyArtifactOperation.NAME,
-         new MassEditDirtyArtifactOperation()));
+      items.add(new XNavigateItemOperation(null, FrameworkImage.ARTIFACT_MASS_EDITOR,
+         MassEditDirtyArtifactOperation.NAME, new MassEditDirtyArtifactOperation()));
 
       return items;
    }
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/images/artifact_editor.gif b/plugins/org.eclipse.osee.framework.ui.skynet/images/artifact_editor.gif
index a88fcbf1940..189f76cfdec 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/images/artifact_editor.gif
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/images/artifact_editor.gif
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/images/artifact_mass_editor.gif b/plugins/org.eclipse.osee.framework.ui.skynet/images/artifact_mass_editor.gif
new file mode 100644
index 00000000000..022515e7da9
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/images/artifact_mass_editor.gif
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/plugin.xml b/plugins/org.eclipse.osee.framework.ui.skynet/plugin.xml
index 59f214ac0a8..4c0257289bc 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/plugin.xml
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/plugin.xml
@@ -73,7 +73,7 @@
 	<extension point="org.eclipse.ui.editors">
 		<editor class="org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor" contributorClass="org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditorContributor" default="false" icon="images/artifact_editor.gif" id="org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor" name="Artifact Editor"/>
 		<editor class="org.eclipse.osee.framework.ui.skynet.blam.BlamEditor" default="false" icon="images/blam.gif" id="org.eclipse.osee.framework.ui.skynet.blam.BlamEditor" name="Blam Editor"/>
-		<editor class="org.eclipse.osee.framework.ui.skynet.artifact.massEditor.MassArtifactEditor" default="false" icon="images/artifact_editor.gif" id="org.eclipse.osee.framework.ui.skynet.massEditor.MassArtifactEditor" name="Mass Artifact Editor"/>
+		<editor class="org.eclipse.osee.framework.ui.skynet.artifact.massEditor.MassArtifactEditor" default="false" icon="images/artifact_mass_editor.gif" id="org.eclipse.osee.framework.ui.skynet.massEditor.MassArtifactEditor" name="Mass Artifact Editor"/>
   <editor
           class="org.eclipse.osee.framework.ui.skynet.change.view.ChangeReportEditor"
           default="false"
@@ -1043,11 +1043,11 @@
   </image>
   <image
         commandId="org.eclipse.osee.framework.ui.skynet.artifacteditor.command"
-        icon="images/laser_16_16.gif">
+        icon="images/artifact_editor.gif">
   </image>
   <image
         commandId="org.eclipse.osee.framework.ui.skynet.new.artifacteditor.command"
-        icon="images/laser_16_16.gif">
+        icon="images/artifact_editor.gif">
   </image>
   <image
         commandId="org.eclipse.osee.framework.ui.skynet.widgets.xchange.ChangeReport"
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/FrameworkImage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/FrameworkImage.java
index baa8fa09ff7..4bcdec0b296 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/FrameworkImage.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/FrameworkImage.java
@@ -23,6 +23,7 @@ public enum FrameworkImage implements KeyedImage {
    ADD_GREEN("add.png"),
    ARCHIVE("archive.gif"),
    ARTIFACT_EDITOR("artifact_editor.gif"),
+   ARTIFACT_MASS_EDITOR("artifact_mass_editor.gif"),
    ARTIFACT_EXPLORER("artifact_explorer.gif"),
    ARTIFACT_IMPORT_WIZARD("artifact_import_wiz.png"),
    ARTIFACT_SEARCH("artifact_search.gif"),
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditor.java
index addfa36ae5c..7a11fd887d7 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditor.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditor.java
@@ -159,7 +159,6 @@ public class ArtifactEditor extends AbstractEventArtifactEditor {
    protected void addPages() {
       OseeStatusContributionItemFactory.addTo(this, true);
       setPartName(getEditorInput().getName());
-      setTitleImage(getEditorInput().getImage());
 
       formPage = new ArtifactFormPage(this, "ArtifactFormPage", null);
       try {
@@ -231,7 +230,6 @@ public class ArtifactEditor extends AbstractEventArtifactEditor {
       public IStatus runInUIThread(IProgressMonitor monitor) {
          try {
             setPartName(getEditorInput().getName());
-            setTitleImage(getEditorInput().getImage());
             ArtifactEditorOutlinePage outlinePage = getOutlinePage();
             outlinePage.refresh();
 
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/BaseArtifactEditorInput.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/BaseArtifactEditorInput.java
index 7dfb427a09d..f093b382f7f 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/BaseArtifactEditorInput.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/BaseArtifactEditorInput.java
@@ -13,7 +13,8 @@ package org.eclipse.osee.framework.ui.skynet.artifact.editor;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager;
+import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
+import org.eclipse.osee.framework.ui.swt.ImageManager;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IPersistableElement;
@@ -45,11 +46,11 @@ public abstract class BaseArtifactEditorInput implements IEditorInput {
 
    @Override
    public ImageDescriptor getImageDescriptor() {
-      return ArtifactImageManager.getImageDescriptor(artifact);
+      return ImageManager.getImageDescriptor(FrameworkImage.ARTIFACT_EDITOR);
    }
 
    public Image getImage() {
-      return ArtifactImageManager.getImage(artifact);
+      return ImageManager.getImage(FrameworkImage.ARTIFACT_EDITOR);
    }
 
    @Override
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DefaultArtifactRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DefaultArtifactRenderer.java
index eea22a72d88..8013041e6b1 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DefaultArtifactRenderer.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DefaultArtifactRenderer.java
@@ -171,8 +171,10 @@ public class DefaultArtifactRenderer implements IRenderer {
    public ImageDescriptor getCommandImageDescriptor(Command command, Artifact artifact) {
       String id = command.getId();
       ImageDescriptor descriptor;
-      if (OPEN_MASS_EDITOR_CMD_ID.equals(id)) {
+      if (OPEN_ART_EDITOR_CMD_ID.equals(id)) {
          descriptor = ImageManager.getImageDescriptor(FrameworkImage.ARTIFACT_EDITOR);
+      } else if (OPEN_MASS_EDITOR_CMD_ID.equals(id)) {
+         descriptor = ImageManager.getImageDescriptor(FrameworkImage.ARTIFACT_MASS_EDITOR);
       } else if (OPEN_ART_EXPLORER_CMD_ID.equals(id)) {
          descriptor = ImageManager.getImageDescriptor(FrameworkImage.ARTIFACT_EXPLORER);
       } else if (OPEN_ART_HISTORY_CMD_ID.equals(id)) {