refactor: Add osee_32_fix_dev.gif for use by workspace icon override

9 files changed, 29 insertions, 38 deletions

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AtsAttributeTypes.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AtsAttributeTypes.java
index a758ef55ae9..d75481b04dc 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AtsAttributeTypes.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AtsAttributeTypes.java
@@ -101,10 +101,13 @@ public final class AtsAttributeTypes {
    public static final IAttributeType ValidationRequired = createType("AAMFEcjT0TwkD2R4w1QA", "Validation Required", "If selected, originator will be asked to validate the implementation.");
    public static final IAttributeType VersionLocked = createType("AAzRtEJXbjzR5jySOZgA", "Version Locked", "True if version artifact is locked.");
    public static final IAttributeType WeeklyBenefit = createType("AAMFEdEnEU9AecOHMOwA", "Weekly Benefit", "Estimated number of hours that will be saved over a single year if this change is completed.");
-   public static final IAttributeType WorkflowDefinition = createType("ADG50fkFrQIxmfZgk3gA", "Workflow Definition", "Specific work flow definition id used by this Workflow artifact");
-   public static final IAttributeType RelatedTaskWorkflowDefinition = createType("AdR02A0xcUq4arK58BAA", "Related Task Workflow Definition", "Specific work flow definition id used by Tasks related to this Workflow");
+   public static final IAttributeType WorkflowDefinitionOld = createType("ADG50fkFrQIxmfZgk3gA", "Workflow Definition Old", "Used in 0.9.8 - Unused in 0.9.9 - Specific work flow definition id used by this Workflow artifact");
+   public static final IAttributeType WorkflowDefinition = createType("AbksV06OrBP_ceKCeSQA", "Workflow Definition", "Specific work flow definition id used by this Workflow artifact");
+   public static final IAttributeType RelatedTaskWorkflowDefinitionOld = createType("AdR02A0xcUq4arK58BAA", "Used in 0.9.8 - Unused in 0.9.9 - Related Task Workflow Definition", "Specific work flow definition id used by Tasks related to this Workflow");
+   public static final IAttributeType RelatedTaskWorkflowDefinition = createType("AblApNMuhjVuyDRq6VgA", "Related Task Workflow Definition", "Specific work flow definition id used by Tasks related to this Workflow");
    public static final IAttributeType WorkPackage = createType("AAMFEdpJqRp2wvA2qvAA", "Work Package", "Designated accounting work package for completing workflow.");
    
+   
    // @formatter:on
 
    private static IAttributeType createType(String guid, String name) {
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamDefinitionArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamDefinitionArtifact.java
index bd03a80562f..f8eb01c013e 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamDefinitionArtifact.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamDefinitionArtifact.java
@@ -355,7 +355,7 @@ public class TeamDefinitionArtifact extends Artifact implements ICommitConfigArt
             String id = art.getSoleAttributeValue(CoreAttributeTypes.WorkId, "");
             if (Strings.isValid(id)) {
                // Note: This may skip any complex rules (more than name), but don't think teamdefs have them
-               RuleDefinition ruleDef = WorkDefinitionFactory.getRuleById(id);
+               RuleDefinition ruleDef = WorkDefinitionFactory.getRuleById(id.replaceFirst("^ats", ""));
                if (ruleDef == null) {
                   OseeLog.log(AtsPlugin.class, Level.SEVERE, String.format("Null work rule for " + id));
                } else {
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java
index 1ba32fc5b80..25b3c8d1db4 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java
@@ -45,7 +45,6 @@ import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
 import org.eclipse.osee.framework.core.enums.CoreBranches;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.database.core.OseeInfo;
 import org.eclipse.osee.framework.jdk.core.util.Collections;
 import org.eclipse.osee.framework.logging.OseeLevel;
 import org.eclipse.osee.framework.logging.OseeLog;
@@ -508,21 +507,6 @@ public final class AtsUtil {
    public static boolean dbInitWorkItemDefs() {
       return dbInitWorkItemDefs;
    }
-   public static Boolean useNewWorkDefintions = null;
-
-   public synchronized static boolean isUseNewWorkDefinitions() {
-      if (useNewWorkDefintions == null) {
-         useNewWorkDefintions = Boolean.valueOf(System.getProperty("ats.useNewWorkDefinitions"));
-         if (!useNewWorkDefintions) {
-            try {
-               useNewWorkDefintions = OseeInfo.getCachedValue("ats.useNewWorkDefinitions").equals("true");
-            } catch (OseeCoreException ex) {
-               OseeLog.log(AtsPlugin.class, Level.WARNING, ex);
-            }
-         }
-      }
-      return useNewWorkDefintions;
-   }
 
    public static Artifact getFromToken(IArtifactToken token) {
       Artifact toReturn = null;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/VersionArtifactLabelProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/VersionArtifactLabelProvider.java
index 426ebb14968..cf36daf2b0f 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/VersionArtifactLabelProvider.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/VersionArtifactLabelProvider.java
@@ -14,7 +14,6 @@ import java.util.Date;
 import java.util.logging.Level;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.osee.ats.artifact.AtsAttributeTypes;
-import org.eclipse.osee.ats.artifact.VersionCommitConfigArtifact;
 import org.eclipse.osee.ats.internal.AtsPlugin;
 import org.eclipse.osee.ats.util.AtsArtifactTypes;
 import org.eclipse.osee.framework.jdk.core.util.DateUtil;
@@ -31,7 +30,7 @@ public class VersionArtifactLabelProvider extends LabelProvider {
 
    @Override
    public String getText(Object element) {
-      if (element instanceof VersionCommitConfigArtifact) {
+      if (element instanceof Artifact) {
          Artifact verArt = (Artifact) element;
          String str = verArt.getName();
          try {
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/VersionListDialog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/VersionListDialog.java
index 62a6d153715..c0e4a7ae9b1 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/VersionListDialog.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/VersionListDialog.java
@@ -12,7 +12,6 @@ package org.eclipse.osee.ats.util.widgets.dialog;
 
 import java.util.Collection;
 import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.osee.ats.artifact.VersionCommitConfigArtifact;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.ui.skynet.util.ArtifactNameReverseSorter;
 import org.eclipse.osee.framework.ui.swt.Displays;
@@ -34,7 +33,7 @@ public class VersionListDialog extends org.eclipse.ui.dialogs.ListDialog {
          public Object[] getElements(Object inputElement) {
             if (inputElement instanceof Collection) {
                Collection list = (Collection) inputElement;
-               return list.toArray(new VersionCommitConfigArtifact[list.size()]);
+               return list.toArray(new Artifact[list.size()]);
             }
             return super.getElements(inputElement);
          }
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/AtsWorkDefinitionSheetProviders.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/AtsWorkDefinitionSheetProviders.java
index 4850318d59b..0ba4f2d3fed 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/AtsWorkDefinitionSheetProviders.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/AtsWorkDefinitionSheetProviders.java
@@ -33,6 +33,7 @@ import org.eclipse.osee.framework.jdk.core.util.Strings;
 import org.eclipse.osee.framework.logging.OseeLevel;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.plugin.core.PluginUtil;
+import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
 import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
@@ -71,7 +72,11 @@ public final class AtsWorkDefinitionSheetProviders {
 
    public static void initializeDatabase(XResultData resultData, boolean onlyWorkDefinitions) throws OseeCoreException {
       SkynetTransaction transaction = new SkynetTransaction(AtsUtil.getAtsBranch(), "Import ATS Work Definitions");
-      Artifact folder = AtsUtil.getFromToken(AtsArtifactToken.WorkDefinitionsFolder);
+      Artifact folder =
+         OseeSystemArtifacts.getOrCreateArtifact(AtsArtifactToken.WorkDefinitionsFolder, AtsUtil.getAtsBranch());
+      if (folder.isDirty()) {
+         folder.persist(transaction);
+      }
       for (WorkDefinitionSheet sheet : getWorkDefinitionSheets()) {
          if (isValidSheet(sheet)) {
             String logStr = String.format("Importing ATS sheet [%s]", sheet.getName());
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/WorkDefinitionFactory.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/WorkDefinitionFactory.java
index 3c24780e438..3190a0f196b 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/WorkDefinitionFactory.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/WorkDefinitionFactory.java
@@ -14,7 +14,6 @@ import org.eclipse.osee.ats.actions.wizard.ITeamWorkflowProvider;
 import org.eclipse.osee.ats.artifact.AbstractWorkflowArtifact;
 import org.eclipse.osee.ats.artifact.AtsAttributeTypes;
 import org.eclipse.osee.ats.artifact.DecisionReviewArtifact;
-import org.eclipse.osee.ats.artifact.GoalArtifact;
 import org.eclipse.osee.ats.artifact.PeerToPeerReviewArtifact;
 import org.eclipse.osee.ats.artifact.TaskArtifact;
 import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact;
@@ -22,7 +21,6 @@ import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.artifact.TeamWorkflowProviders;
 import org.eclipse.osee.ats.internal.AtsPlugin;
 import org.eclipse.osee.ats.util.AtsArtifactTypes;
-import org.eclipse.osee.ats.util.AtsUtil;
 import org.eclipse.osee.ats.util.widgets.DecisionOption;
 import org.eclipse.osee.ats.util.widgets.XDecisionOptions;
 import org.eclipse.osee.ats.workdef.provider.AtsWorkDefinitionProvider;
@@ -129,7 +127,7 @@ public class WorkDefinitionFactory {
          WorkDefinitionMatch match = new WorkDefinitionMatch();
          String translatedId = WorkDefinitionFactory.getOverrideWorkDefId(id);
          // Try to get from new DSL provider if configured to use it
-         if (!match.isMatched() && AtsUtil.isUseNewWorkDefinitions()) {
+         if (!match.isMatched()) {
             WorkDefinition workDef = AtsWorkDefinitionProvider.get().getWorkFlowDefinition(translatedId);
             if (workDef != null) {
                match.setWorkDefinition(workDef);
@@ -537,14 +535,11 @@ public class WorkDefinitionFactory {
 
    public static String getOverrideWorkDefId(String id) {
       // Don't override if no providers available (dsl plugins not released)
-      if (AtsUtil.isUseNewWorkDefinitions()) {
-
-         String overrideId = AtsWorkDefinitionSheetProviders.getOverrideId(id);
-         if (Strings.isValid(overrideId)) {
-            OseeLog.log(AtsPlugin.class, Level.INFO,
-               String.format("Override WorkDefinition [%s] with [%s]", id, overrideId));
-            return overrideId;
-         }
+      String overrideId = AtsWorkDefinitionSheetProviders.getOverrideId(id);
+      if (Strings.isValid(overrideId)) {
+         OseeLog.log(AtsPlugin.class, Level.INFO,
+            String.format("Override WorkDefinition [%s] with [%s]", id, overrideId));
+         return overrideId;
       }
       return id;
    }
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/images/osee_32_fix_dev.gif b/plugins/org.eclipse.osee.framework.ui.skynet/images/osee_32_fix_dev.gif
new file mode 100644
index 00000000000..03fa76b43a1
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/images/osee_32_fix_dev.gif
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/SetWorkbenchOverrideIconBlam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/SetWorkbenchOverrideIconBlam.java
index c24ca358e4b..bb99f041feb 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/SetWorkbenchOverrideIconBlam.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/SetWorkbenchOverrideIconBlam.java
@@ -26,6 +26,7 @@ import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
 import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
 import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam;
 import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
+import org.eclipse.osee.framework.ui.swt.Displays;
 import org.eclipse.osee.framework.ui.swt.ImageManager;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Display;
@@ -99,10 +100,15 @@ public class SetWorkbenchOverrideIconBlam extends AbstractBlam {
 
    public static void overrideImage(Image overrideImage) {
       for (IWorkbenchWindow window : Workbench.getInstance().getWorkbenchWindows()) {
-         Shell appShell = window.getShell();
+         final Shell appShell = window.getShell();
          // Set the application icons
-         Image[] appIcons = {overrideImage, overrideImage, overrideImage};
-         appShell.setImages(appIcons);
+         final Image[] appIcons = {overrideImage, overrideImage, overrideImage};
+         Displays.ensureInDisplayThread(new Runnable() {
+            @Override
+            public void run() {
+               appShell.setImages(appIcons);
+            }
+         });
       }
    }