feature[ats_JTTQA]: Add Mass Editor to open with menu

4 files changed, 41 insertions, 9 deletions

diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/plugin.xml b/plugins/org.eclipse.osee.framework.ui.skynet/plugin.xml
index 1ba55205f54..28526c11a22 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/plugin.xml
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/plugin.xml
@@ -1276,7 +1276,7 @@
        point="org.eclipse.ui.commands">
     <command
           id="org.eclipse.osee.framework.ui.skynet.OpenMassEditcommand"
-          name="Mass Edit">
+          name="Mass Editor">
     </command>
     <command
           id="org.eclipse.osee.framework.ui.skynet.skywalker.command"
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/OpenMassArtifactEditorHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/OpenMassArtifactEditorHandler.java
index c082f35b064..f14ea94e18d 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/OpenMassArtifactEditorHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/OpenMassArtifactEditorHandler.java
@@ -12,8 +12,11 @@ package org.eclipse.osee.framework.ui.skynet.commandHandlers;
 
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.ui.skynet.artifact.massEditor.MassArtifactEditor;
+import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
 import org.eclipse.osee.framework.ui.skynet.commandHandlers.renderer.handlers.AbstractEditorHandler;
+import org.eclipse.osee.framework.ui.skynet.render.IRenderer;
+import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
+import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
 
 /**
  * @author Jeff C. Phillips
@@ -22,7 +25,8 @@ public class OpenMassArtifactEditorHandler extends AbstractEditorHandler {
 
    @Override
    public Object executeWithException(ExecutionEvent arg0) throws OseeCoreException {
-      MassArtifactEditor.editArtifacts("", artifacts);
+      RendererManager.openInJob(artifacts, new VariableMap(IRenderer.OPEN_IN_TABLE_EDITOR, Boolean.TRUE),
+         PresentationType.GENERALIZED_EDIT);
       return null;
    }
 }
\ No newline at end of file
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 f3273f3d7c3..533dbfeca04 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
@@ -20,6 +20,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.logging.Level;
 import org.eclipse.core.commands.Command;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.osee.framework.core.data.IAttributeType;
@@ -35,9 +36,11 @@ import org.eclipse.osee.framework.skynet.core.relation.RelationManager;
 import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderData;
 import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
 import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager;
+import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
 import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
 import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor;
 import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditorInput;
+import org.eclipse.osee.framework.ui.skynet.artifact.massEditor.MassArtifactEditor;
 import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
 import org.eclipse.osee.framework.ui.skynet.render.compare.DefaultArtifactCompare;
 import org.eclipse.osee.framework.ui.skynet.render.compare.IComparator;
@@ -45,6 +48,7 @@ import org.eclipse.osee.framework.ui.skynet.render.word.AttributeElement;
 import org.eclipse.osee.framework.ui.skynet.render.word.Producer;
 import org.eclipse.osee.framework.ui.skynet.render.word.WordMLProducer;
 import org.eclipse.osee.framework.ui.swt.Displays;
+import org.eclipse.osee.framework.ui.swt.ImageManager;
 
 /**
  * @author Ryan D. Brooks
@@ -54,6 +58,7 @@ public class DefaultArtifactRenderer implements IRenderer {
    private static final IComparator DEFAULT_COMPARATOR = new DefaultArtifactCompare();
 
    private static final String OPEN_ART_EDITOR_CMD_ID = "org.eclipse.osee.framework.ui.skynet.artifacteditor.command";
+   private static final String OPEN_MASS_EDITOR_CMD_ID = "org.eclipse.osee.framework.ui.skynet.OpenMassEditcommand";
 
    private VariableMap options;
 
@@ -156,7 +161,14 @@ public class DefaultArtifactRenderer implements IRenderer {
 
    @Override
    public ImageDescriptor getCommandImageDescriptor(Command command, Artifact artifact) {
-      return ArtifactImageManager.getImageDescriptor(artifact);
+      String id = command.getId();
+      ImageDescriptor descriptor;
+      if (OPEN_MASS_EDITOR_CMD_ID.equals(id)) {
+         descriptor = ImageManager.getImageDescriptor(FrameworkImage.ARTIFACT_EDITOR);
+      } else {
+         descriptor = ArtifactImageManager.getImageDescriptor(artifact);
+      }
+      return descriptor;
    }
 
    @Override
@@ -165,6 +177,7 @@ public class DefaultArtifactRenderer implements IRenderer {
 
       if (commandGroup.isEdit()) {
          commandIds.add(OPEN_ART_EDITOR_CMD_ID);
+         commandIds.add(OPEN_MASS_EDITOR_CMD_ID);
       }
 
       return commandIds;
@@ -201,14 +214,28 @@ public class DefaultArtifactRenderer implements IRenderer {
       Displays.ensureInDisplayThread(new Runnable() {
          @Override
          public void run() {
-            try {
-               for (Artifact artifact : artifacts) {
-                  AWorkbench.getActivePage().openEditor(new ArtifactEditorInput(artifact), ArtifactEditor.EDITOR_ID);
+            if (isDisplayInMassEditor()) {
+               MassArtifactEditor.editArtifacts("", artifacts);
+            } else {
+               try {
+                  for (Artifact artifact : artifacts) {
+                     AWorkbench.getActivePage().openEditor(new ArtifactEditorInput(artifact), ArtifactEditor.EDITOR_ID);
+                  }
+               } catch (Exception ex) {
+                  OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
                }
-            } catch (Exception ex) {
-               OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
             }
          }
       });
    }
+
+   private boolean isDisplayInMassEditor() {
+      boolean result = false;
+      try {
+         result = getBooleanOption(IRenderer.OPEN_IN_TABLE_EDITOR);
+      } catch (OseeArgumentException ex) {
+         OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
+      }
+      return result;
+   }
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/IRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/IRenderer.java
index f51f308e54f..170d138f7b7 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/IRenderer.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/IRenderer.java
@@ -39,6 +39,7 @@ public interface IRenderer {
    public static final String FILE_NAME_OPTION = "filename";
    public static final String NO_DISPLAY = "noDisplay";
    public static final String SKIP_DIALOGS = "skipDialogs";
+   public static final String OPEN_IN_TABLE_EDITOR = "open.with.mass.artifact.editor";
 
    public static enum CommandGroup {
       PREVIEW(PresentationType.PREVIEW),