refactor: Remove IWorldViewArtifact interface

13 files changed, 29 insertions, 41 deletions

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AbstractAtsArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AbstractAtsArtifact.java
index 5ed770f5f69..733b30ed6cd 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AbstractAtsArtifact.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AbstractAtsArtifact.java
@@ -15,8 +15,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import org.eclipse.osee.ats.util.Overview;
-import org.eclipse.osee.framework.core.enums.DeletionFlag;
 import org.eclipse.osee.framework.core.data.IArtifactType;
+import org.eclipse.osee.framework.core.enums.DeletionFlag;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.model.Branch;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AbstractWorkflowArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AbstractWorkflowArtifact.java
index 12c2c1cc2fc..ec12b332278 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AbstractWorkflowArtifact.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AbstractWorkflowArtifact.java
@@ -45,7 +45,6 @@ import org.eclipse.osee.ats.workdef.WorkDefinitionFactory;
 import org.eclipse.osee.ats.workdef.WorkDefinitionMatch;
 import org.eclipse.osee.ats.workflow.ATSXWidgetOptionResolver;
 import org.eclipse.osee.ats.workflow.TransitionManager;
-import org.eclipse.osee.ats.world.IWorldViewArtifact;
 import org.eclipse.osee.framework.access.AccessControlManager;
 import org.eclipse.osee.framework.core.data.IArtifactType;
 import org.eclipse.osee.framework.core.data.IRelationTypeSide;
@@ -81,7 +80,7 @@ import org.osgi.framework.ServiceReference;
 /**
  * @author Donald G. Dunne
  */
-public abstract class AbstractWorkflowArtifact extends AbstractAtsArtifact implements HasCmAccessControl, IGroupExplorerProvider, IWorldViewArtifact {
+public abstract class AbstractWorkflowArtifact extends AbstractAtsArtifact implements HasCmAccessControl, IGroupExplorerProvider {
 
    private final Set<IRelationTypeSide> atsWorldRelations = new HashSet<IRelationTypeSide>();
    private Collection<User> transitionAssignees;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionArtifact.java
index 66da8fbc886..d93add6cc81 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionArtifact.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionArtifact.java
@@ -14,7 +14,6 @@ import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 import org.eclipse.osee.ats.util.AtsRelationTypes;
-import org.eclipse.osee.ats.world.IWorldViewArtifact;
 import org.eclipse.osee.framework.core.data.IArtifactType;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.model.Branch;
@@ -24,7 +23,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.ArtifactFactory;
 /**
  * @author Donald G. Dunne
  */
-public class ActionArtifact extends AbstractAtsArtifact implements IWorldViewArtifact {
+public class ActionArtifact extends AbstractAtsArtifact {
 
    public ActionArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, IArtifactType artifactType) throws OseeCoreException {
       super(parentFactory, guid, humanReadableId, branch, artifactType);
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/DeadlineColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/DeadlineColumn.java
index abfab7b77df..41eac813ed2 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/DeadlineColumn.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/DeadlineColumn.java
@@ -13,10 +13,10 @@ import org.eclipse.osee.ats.artifact.AtsAttributeTypes;
 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.util.DeadlineManager;
 import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsAttributeValueColumn;
-import org.eclipse.osee.ats.world.IWorldViewArtifact;
 import org.eclipse.osee.ats.world.WorldXViewerFactory;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.jdk.core.util.DateUtil;
+import org.eclipse.osee.framework.skynet.core.artifact.IATSArtifact;
 import org.eclipse.osee.framework.ui.plugin.util.Result;
 import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
 import org.eclipse.osee.framework.ui.swt.ImageManager;
@@ -50,7 +50,7 @@ public class DeadlineColumn extends XViewerAtsAttributeValueColumn {
    @Override
    public Image getColumnImage(Object element, XViewerColumn xCol, int columnIndex) {
       try {
-         if (!(element instanceof IWorldViewArtifact)) {
+         if (!(element instanceof IATSArtifact)) {
             return null;
          }
          if (isDeadlineAlerting(element).isTrue()) {
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/EstimatedCompletionDateColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/EstimatedCompletionDateColumn.java
index 4b3f26afb7c..80143b909f8 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/EstimatedCompletionDateColumn.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/EstimatedCompletionDateColumn.java
@@ -15,11 +15,11 @@ import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.internal.AtsPlugin;
 import org.eclipse.osee.ats.util.DeadlineManager;
 import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsAttributeValueColumn;
-import org.eclipse.osee.ats.world.IWorldViewArtifact;
 import org.eclipse.osee.ats.world.WorldXViewerFactory;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.jdk.core.util.DateUtil;
 import org.eclipse.osee.framework.logging.OseeLog;
+import org.eclipse.osee.framework.skynet.core.artifact.IATSArtifact;
 import org.eclipse.osee.framework.ui.plugin.util.Result;
 import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
 import org.eclipse.osee.framework.ui.swt.ImageManager;
@@ -55,7 +55,7 @@ public class EstimatedCompletionDateColumn extends XViewerAtsAttributeValueColum
    @Override
    public Image getColumnImage(Object element, XViewerColumn xCol, int columnIndex) {
       try {
-         if (!(element instanceof IWorldViewArtifact)) {
+         if (!(element instanceof IATSArtifact)) {
             return null;
          }
          if (isWorldViewEcdAlerting(element).isTrue()) {
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OperationalImpactColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OperationalImpactColumn.java
index e4311ecfa45..be882fad117 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OperationalImpactColumn.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OperationalImpactColumn.java
@@ -16,10 +16,10 @@ import org.eclipse.osee.ats.artifact.AtsAttributeTypes;
 import org.eclipse.osee.ats.artifact.TaskArtifact;
 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.internal.AtsPlugin;
-import org.eclipse.osee.ats.world.IWorldViewArtifact;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.jdk.core.util.Collections;
 import org.eclipse.osee.framework.logging.OseeLog;
+import org.eclipse.osee.framework.skynet.core.artifact.IATSArtifact;
 import org.eclipse.swt.SWT;
 
 public class OperationalImpactColumn extends XViewerValueColumn {
@@ -48,9 +48,9 @@ public class OperationalImpactColumn extends XViewerValueColumn {
 
    @Override
    public String getColumnText(Object element, XViewerColumn column, int columnIndex) {
-      if (element instanceof IWorldViewArtifact) {
+      if (element instanceof IATSArtifact) {
          try {
-            return getOperationalImpact((IWorldViewArtifact) element);
+            return getOperationalImpact((IATSArtifact) element);
          } catch (OseeCoreException ex) {
             OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
             return XViewerCells.getCellExceptionString(ex);
@@ -59,7 +59,7 @@ public class OperationalImpactColumn extends XViewerValueColumn {
       return "";
    }
 
-   private String getOperationalImpact(IWorldViewArtifact wva) throws OseeCoreException {
+   private String getOperationalImpact(IATSArtifact wva) throws OseeCoreException {
       if (wva instanceof TeamWorkFlowArtifact) {
          return ((TeamWorkFlowArtifact) wva).getArtifact().getSoleAttributeValue(AtsAttributeTypes.OperationalImpact,
             "");
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OperationalImpactWorkaroundColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OperationalImpactWorkaroundColumn.java
index 807acc9ea6d..ff7cb231072 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OperationalImpactWorkaroundColumn.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OperationalImpactWorkaroundColumn.java
@@ -16,10 +16,10 @@ import org.eclipse.osee.ats.artifact.AtsAttributeTypes;
 import org.eclipse.osee.ats.artifact.TaskArtifact;
 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.internal.AtsPlugin;
-import org.eclipse.osee.ats.world.IWorldViewArtifact;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.jdk.core.util.Collections;
 import org.eclipse.osee.framework.logging.OseeLog;
+import org.eclipse.osee.framework.skynet.core.artifact.IATSArtifact;
 import org.eclipse.swt.SWT;
 
 public class OperationalImpactWorkaroundColumn extends XViewerValueColumn {
@@ -48,9 +48,9 @@ public class OperationalImpactWorkaroundColumn extends XViewerValueColumn {
 
    @Override
    public String getColumnText(Object element, XViewerColumn column, int columnIndex) {
-      if (element instanceof IWorldViewArtifact) {
+      if (element instanceof IATSArtifact) {
          try {
-            return getOperationalImpact((IWorldViewArtifact) element);
+            return getOperationalImpact((IATSArtifact) element);
          } catch (OseeCoreException ex) {
             OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
             return XViewerCells.getCellExceptionString(ex);
@@ -59,7 +59,7 @@ public class OperationalImpactWorkaroundColumn extends XViewerValueColumn {
       return "";
    }
 
-   private String getOperationalImpact(IWorldViewArtifact wva) throws OseeCoreException {
+   private String getOperationalImpact(IATSArtifact wva) throws OseeCoreException {
       if (wva instanceof TeamWorkFlowArtifact) {
          return ((TeamWorkFlowArtifact) wva).getArtifact().getSoleAttributeValue(
             AtsAttributeTypes.OperationalImpactWorkaround, "");
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IWorldViewArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IWorldViewArtifact.java
deleted file mode 100644
index 9d511c90992..00000000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IWorldViewArtifact.java
+++ /dev/null
@@ -1,15 +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.ats.world;
-
-public interface IWorldViewArtifact {
-   // Artifact is displayable in WorldXViewer
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java
index b570e2a4d90..b0747f84098 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java
@@ -35,6 +35,7 @@ import org.eclipse.osee.framework.jdk.core.util.DateUtil;
 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.IATSArtifact;
 import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
 import org.eclipse.osee.framework.ui.skynet.action.RefreshAction.IRefreshActionHandler;
 import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
@@ -128,7 +129,7 @@ public class WorldComposite extends ScrolledComposite implements IWorldViewerEve
             worldArts.clear();
             otherArts.clear();
             for (Artifact art : arts) {
-               if (art instanceof IWorldViewArtifact) {
+               if (art instanceof IATSArtifact) {
                   worldArts.add(art);
                } else {
                   otherArts.add(art);
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldLabelProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldLabelProvider.java
index 44256ce8663..beb3496a462 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldLabelProvider.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldLabelProvider.java
@@ -18,6 +18,7 @@ import org.eclipse.nebula.widgets.xviewer.XViewerLabelProvider;
 import org.eclipse.osee.ats.artifact.GoalArtifact;
 import org.eclipse.osee.ats.internal.AtsPlugin;
 import org.eclipse.osee.framework.logging.OseeLog;
+import org.eclipse.osee.framework.skynet.core.artifact.IATSArtifact;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.Image;
@@ -71,7 +72,7 @@ public class WorldLabelProvider extends XViewerLabelProvider {
    public String getColumnText(Object element, XViewerColumn xCol, int columnIndex) {
       try {
          // NOTE: HRID, Type, Title are handled by XViewerValueColumn values
-         if (!(element instanceof IWorldViewArtifact)) {
+         if (!(element instanceof IATSArtifact)) {
             return "";
          }
          for (IAtsWorldEditorItem item : AtsWorldEditorItems.getItems()) {
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldViewDragAndDrop.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldViewDragAndDrop.java
index 68b26bcf540..17326fc1504 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldViewDragAndDrop.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldViewDragAndDrop.java
@@ -29,6 +29,7 @@ import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.plugin.core.util.Jobs;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.ArtifactData;
+import org.eclipse.osee.framework.skynet.core.artifact.IATSArtifact;
 import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
 import org.eclipse.osee.framework.ui.skynet.artifact.ArtifactTransfer;
 import org.eclipse.osee.framework.ui.skynet.util.SkynetDragAndDrop;
@@ -68,7 +69,7 @@ public class WorldViewDragAndDrop extends SkynetDragAndDrop {
          if (artData != null) {
             Artifact[] artifacts = artData.getArtifacts();
             for (Artifact art : artifacts) {
-               if (art instanceof IWorldViewArtifact || art.isOfType(CoreArtifactTypes.UniversalGroup)) {
+               if (art instanceof IATSArtifact || art.isOfType(CoreArtifactTypes.UniversalGroup)) {
                   return true;
                }
             }
@@ -98,7 +99,7 @@ public class WorldViewDragAndDrop extends SkynetDragAndDrop {
                      Artifact[] artifacts = artData.getArtifacts();
                      if (artifacts.length == 1) {
                         Artifact art = artifacts[0];
-                        if (art instanceof IWorldViewArtifact) {
+                        if (art instanceof IATSArtifact) {
                            name = art.getName();
                         } else if (art.isOfType(CoreArtifactTypes.UniversalGroup)) {
                            GroupWorldSearchItem groupWorldSearchItem = new GroupWorldSearchItem(art.getBranch());
@@ -109,11 +110,11 @@ public class WorldViewDragAndDrop extends SkynetDragAndDrop {
                         }
                      }
                      for (Artifact art : artifacts) {
-                        if (art instanceof IWorldViewArtifact) {
+                        if (art instanceof IATSArtifact) {
                            arts.add(art);
                         } else if (art.isOfType(CoreArtifactTypes.UniversalGroup)) {
                            for (Artifact relArt : art.getRelatedArtifacts(CoreRelationTypes.Universal_Grouping__Members)) {
-                              if (relArt instanceof IWorldViewArtifact) {
+                              if (relArt instanceof IATSArtifact) {
                                  arts.add(relArt);
                               }
                            }
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java
index 0587db9bf23..37c712a6591 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java
@@ -59,6 +59,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.IATSArtifact;
 import org.eclipse.osee.framework.skynet.core.artifact.ISelectedArtifacts;
 import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
 import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
@@ -558,7 +559,7 @@ public class WorldXViewer extends XViewer implements ISelectedAtsArtifacts, IPer
    public void load(Collection<Object> objects) {
       Set<Artifact> arts = new HashSet<Artifact>();
       for (Object obj : objects) {
-         if (obj instanceof IWorldViewArtifact) {
+         if (obj instanceof IATSArtifact) {
             arts.add((Artifact) obj);
          }
       }
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerEventManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerEventManager.java
index 9b34e56d0d2..e95c56aeaee 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerEventManager.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerEventManager.java
@@ -21,6 +21,7 @@ import org.eclipse.osee.ats.util.AtsUtil;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+import org.eclipse.osee.framework.skynet.core.artifact.IATSArtifact;
 import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.skynet.core.event.filter.IEventFilter;
 import org.eclipse.osee.framework.skynet.core.event.listener.IArtifactEventListener;
@@ -117,13 +118,13 @@ public class WorldXViewerEventManager {
       private void processArtifact(WorldXViewer worldViewer, Artifact artifact) {
          try {
             // Don't refresh deleted artifacts
-            if (!artifact.isDeleted() && artifact instanceof IWorldViewArtifact) {
+            if (!artifact.isDeleted() && artifact instanceof IATSArtifact) {
                worldViewer.refresh(artifact);
                // If parent is loaded and child changed, refresh parent
                if (artifact instanceof AbstractWorkflowArtifact) {
                   AbstractWorkflowArtifact smaArt = (AbstractWorkflowArtifact) artifact;
                   Artifact smaParent = smaArt.getParentAtsArtifact();
-                  if (smaParent instanceof IWorldViewArtifact) {
+                  if (smaParent instanceof IATSArtifact) {
                      worldViewer.refresh(smaParent);
                   }
                }