bug[TW16871]: Improve message when No Associated Artifact

Change-Id: I2757545d1bfab69f90357ef3c8403dede410dbcc

3 files changed, 18 insertions, 2 deletions

diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/OpenAssociatedArtifact.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/OpenAssociatedArtifact.java
index 72c13733530..c42b2a0bcf4 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/OpenAssociatedArtifact.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/OpenAssociatedArtifact.java
@@ -17,6 +17,7 @@ import org.eclipse.core.runtime.jobs.JobChangeAdapter;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.osee.framework.core.enums.SystemUser;
 import org.eclipse.osee.framework.core.operation.IOperation;
 import org.eclipse.osee.framework.core.operation.Operations;
 import org.eclipse.osee.framework.skynet.core.User;
@@ -45,12 +46,17 @@ public class OpenAssociatedArtifact extends Action {
       IOperation operation = new LoadAssociatedArtifactOperation(changeData);
       Operations.executeAsJob(operation, false, Job.SHORT, new JobChangeAdapter() {
 
+         @SuppressWarnings("unlikely-arg-type")
          @Override
          public void done(IJobChangeEvent event) {
             if (changeData.getAssociatedArtifact() == null) {
                AWorkbench.popup("ERROR", "Cannot access associated artifact.");
             } else {
-               RendererManager.openInJob(changeData.getAssociatedArtifact(), DEFAULT_OPEN);
+               if (SystemUser.OseeSystem.equals(changeData.getAssociatedArtifact())) {
+                  AWorkbench.popup("ERROR", "No Associated Artifact");
+               } else {
+                  RendererManager.openInJob(changeData.getAssociatedArtifact(), DEFAULT_OPEN);
+               }
             }
          }
       });
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/OpenAssociatedArtifactHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/OpenAssociatedArtifactHandler.java
index 9761b9b0398..31265f49f14 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/OpenAssociatedArtifactHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/OpenAssociatedArtifactHandler.java
@@ -17,6 +17,7 @@ import org.eclipse.osee.framework.access.AccessControlManager;
 import org.eclipse.osee.framework.core.data.BranchId;
 import org.eclipse.osee.framework.core.enums.PermissionEnum;
 import org.eclipse.osee.framework.core.enums.PresentationType;
+import org.eclipse.osee.framework.core.enums.SystemUser;
 import org.eclipse.osee.framework.logging.OseeLevel;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.skynet.core.UserManager;
@@ -36,6 +37,7 @@ import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
  */
 public class OpenAssociatedArtifactHandler extends CommandHandler {
 
+   @SuppressWarnings("unlikely-arg-type")
    @Override
    public Object executeWithException(ExecutionEvent event, IStructuredSelection selection) {
       BranchId selectedBranch = Handlers.getBranchesFromStructuredSelection(selection).iterator().next();
@@ -45,6 +47,10 @@ public class OpenAssociatedArtifactHandler extends CommandHandler {
          AWorkbench.popup("Open Associated Artifact", "No artifact associated with branch " + selectedBranch);
          return null;
       }
+      if (SystemUser.OseeSystem.equals(associatedArtifact)) {
+         AWorkbench.popup("ERROR", "No Associated Artifact");
+         return null;
+      }
       if (AccessControlManager.hasPermission(associatedArtifact, PermissionEnum.READ)) {
          IOseeCmService cmService = ServiceUtil.getOseeCmService();
          if (cmService.isPcrArtifact(associatedArtifact)) {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java
index 29f79ac0348..d113026aa2d 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java
@@ -31,6 +31,7 @@ import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.core.data.TransactionToken;
 import org.eclipse.osee.framework.core.enums.ConflictStatus;
 import org.eclipse.osee.framework.core.enums.PresentationType;
+import org.eclipse.osee.framework.core.enums.SystemUser;
 import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
 import org.eclipse.osee.framework.core.model.Branch;
 import org.eclipse.osee.framework.core.operation.IOperation;
@@ -597,9 +598,12 @@ public class MergeXWidget extends GenericXWidget implements IOseeTreeReportProvi
             if (cmService.isPcrArtifact(associatedArtifact)) {
                cmService.openArtifact(associatedArtifact, OseeCmEditor.CmPcrEditor);
             } else if (associatedArtifact.isValid()) {
+               if (SystemUser.OseeSystem.equals(associatedArtifact)) {
+                  AWorkbench.popup("ERROR", "No Associated Artifact");
+               }
                RendererManager.open(associatedArtifact, PresentationType.SPECIALIZED_EDIT);
             } else {
-               AWorkbench.popup("ERROR", "Unknown branch association");
+               AWorkbench.popup("ERROR", "Associated Artifact is invalid");
             }
          } catch (Exception ex) {
             OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);