5 files changed, 17 insertions, 17 deletions

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java
index b8cdaa0d460..d46909df8ad 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java
@@ -351,7 +351,7 @@ public abstract class StateMachineArtifact extends ATSArtifact implements IGroup
    }

 

    public String getEditorTitle() throws OseeCoreException {

-      return getDescriptiveName();

+      return getWorldViewType() + ": " + getDescriptiveName();

    }

 

    public String getWorldViewActionableItems() throws OseeCoreException {

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkFlowArtifact.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkFlowArtifact.java
index 9e6ea819899..f057ad41718 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkFlowArtifact.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkFlowArtifact.java
@@ -67,7 +67,7 @@ public class TeamWorkFlowArtifact extends TaskableStateMachineArtifact implement
     * @param guid

     * @param humanReadableId

     * @param branch

- * @throws OseeDataStoreException 

+    * @throws OseeDataStoreException

     */

    public TeamWorkFlowArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeDataStoreException {

       super(parentFactory, guid, humanReadableId, branch, artifactType);

@@ -173,7 +173,10 @@ public class TeamWorkFlowArtifact extends TaskableStateMachineArtifact implement
 

    @Override

    public String getEditorTitle() throws OseeCoreException {

-      return getTeamTitle();

+      if (getWorldViewTargetedVersion() != null) {

+         return smaMgr.getSma().getWorldViewType() + ": " + "[" + getWorldViewTargetedVersionStr() + "] - " + getDescriptiveName();

+      }

+      return super.getEditorTitle();

    }

 

    @Override

@@ -225,14 +228,6 @@ public class TeamWorkFlowArtifact extends TaskableStateMachineArtifact implement
       return AtsCacheManager.getTeamDefinitionArtifact(guid);

    }

 

-   public String getTeamTitle() throws OseeCoreException {

-      if (getWorldViewTargetedVersion() != null) {

-         return "[" + getTeamName() + "][" + getWorldViewTargetedVersionStr() + "] - " + getDescriptiveName();

-      } else {

-         return "[" + getTeamName() + "] - " + getDescriptiveName();

-      }

-   }

-

    public String getTeamName() {

       try {

          return getTeamDefinition().getDescriptiveName();

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkflowLabelProvider.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkflowLabelProvider.java
index d4dda9ee7f2..0b6b26dbf72 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkflowLabelProvider.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkflowLabelProvider.java
@@ -21,9 +21,6 @@ import org.eclipse.osee.framework.ui.skynet.ArtifactLabelProvider;
  */
 public class TeamWorkflowLabelProvider extends ArtifactLabelProvider {
 
-   /**
-    * 
-    */
    public TeamWorkflowLabelProvider() {
       super();
    }
@@ -33,9 +30,13 @@ public class TeamWorkflowLabelProvider extends ArtifactLabelProvider {
     */
    @Override
    public String getText(Object element) {
-      TeamWorkFlowArtifact wf = (TeamWorkFlowArtifact) element;
+      TeamWorkFlowArtifact teamWf = (TeamWorkFlowArtifact) element;
       try {
-         return wf.getTeamTitle();
+         if (teamWf.getWorldViewTargetedVersion() != null) {
+            return "[" + teamWf.getTeamName() + "][" + teamWf.getWorldViewTargetedVersionStr() + "] - " + teamWf.getDescriptiveName();
+         } else {
+            return "[" + teamWf.getTeamName() + "] - " + teamWf.getDescriptiveName();
+         }
       } catch (OseeCoreException ex) {
          OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
          return "Exception: " + ex.getLocalizedMessage();
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java
index 1cd619e1024..3df487bef2f 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java
@@ -184,7 +184,7 @@ public class SMAEditor extends AbstractArtifactEditor implements IDirtiableEdito
    }
 
    public String getTitleStr() throws OseeCoreException {
-      return smaMgr.getSma().getWorldViewType() + ": " + smaMgr.getSma().getDescriptiveName();
+      return smaMgr.getEditorTitle();
    }
 
    public static void createLabelValue(XFormToolkit toolkit, Composite comp, String labelStr, String valueStr) throws OseeCoreException {
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAManager.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAManager.java
index 5c9f7ba36e6..4d19663abb1 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAManager.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAManager.java
@@ -823,6 +823,10 @@ public class SMAManager {
       return editor;

    }

 

+   public String getEditorTitle() throws OseeCoreException {

+      return getSma().getEditorTitle();

+   }

+

    /**

     * @param editor The editor to set.

     */