Cleanup user images

21 files changed, 111 insertions, 31 deletions

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/AtsArtifactImageProvider.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/AtsArtifactImageProvider.java
index db43ac2fa09..c247f795816 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/AtsArtifactImageProvider.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/AtsArtifactImageProvider.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.osee.ats;
 
+import java.util.logging.Level;
 import org.eclipse.osee.ats.artifact.DecisionReviewArtifact;
 import org.eclipse.osee.ats.artifact.PeerToPeerReviewArtifact;
 import org.eclipse.osee.ats.artifact.StateMachineArtifact;
@@ -17,6 +18,8 @@ import org.eclipse.osee.ats.artifact.TaskArtifact;
 import org.eclipse.osee.ats.artifact.TeamWorkflowExtensions;
 import org.eclipse.osee.ats.artifact.VersionArtifact;
 import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
+import org.eclipse.osee.framework.db.connection.exception.OseeTypeDoesNotExist;
+import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.skynet.core.UserManager;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
@@ -40,7 +43,12 @@ public class AtsArtifactImageProvider extends ArtifactImageProvider {
       ImageManager.registerProvider(this, ArtifactTypeManager.getType(PeerToPeerReviewArtifact.ARTIFACT_NAME));
       ImageManager.registerProvider(this, ArtifactTypeManager.getType(DecisionReviewArtifact.ARTIFACT_NAME));
       for (String artName : TeamWorkflowExtensions.getInstance().getAllTeamWorkflowArtifactNames()) {
-         ImageManager.registerProvider(this, ArtifactTypeManager.getType(artName));
+         System.out.println(String.format("Registering for Team Workflow [%s]", artName));
+         try {
+            ImageManager.registerProvider(this, ArtifactTypeManager.getType(artName));
+         } catch (OseeTypeDoesNotExist ex) {
+            OseeLog.log(AtsPlugin.class, Level.INFO, ex);
+         }
       }
    }
 
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 4165053f3f5..f940970865a 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
@@ -380,9 +380,13 @@ public abstract class StateMachineArtifact extends ATSArtifact implements IGroup
    public Image getAssigneeImage() throws OseeCoreException {

       if (isDeleted()) return null;

       if (smaMgr.getStateMgr().getAssignees().size() > 0) {

-         if (smaMgr.isAssigneeMe())

-            return ImageManager.getImage(FrameworkImage.USER_SM_RED);

-         else

+         if (smaMgr.isUserSystem()) {

+            return ImageManager.getImage(FrameworkImage.USER_GREY);

+         } else if (smaMgr.isUserInactive()) {

+            return ImageManager.getImage(FrameworkImage.USER_YELLOW);

+         } else if (smaMgr.isAssigneeMe()) {

+            return ImageManager.getImage(FrameworkImage.USER_RED);

+         } else

             return ImageManager.getImage(ArtifactTypeManager.getType("User"));

       }

       return null;

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 526a0de1a76..c11048a1119 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
@@ -115,6 +115,22 @@ public class SMAManager {
       SMAEditor.close(sma, save);

    }

 

+   public boolean isUserInactive() throws OseeCoreException {

+      for (User user : stateMgr.getAssignees()) {

+         if (!user.isActive()) {

+            return true;

+         }

+      }

+      return false;

+   }

+

+   public boolean isUserSystem() throws OseeCoreException {

+      for (User user : stateMgr.getAssignees()) {

+         if (user.isSystemUser()) return true;

+      }

+      return false;

+   }

+

    public Set<User> getPrivilegedUsers() throws OseeCoreException {

       return sma.getPrivilegedUsers();

    }

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java
index bd10ab76518..f91ac9632f0 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java
@@ -270,8 +270,12 @@ public class SMAWorkFlowTab extends FormPage implements IActionable {
       }
       for (SMAWorkFlowSection section : sections)
          section.dispose();
-      toolbarArea.dispose();
-      toolkit.dispose();
+      if (toolbarArea != null) {
+         toolbarArea.dispose();
+      }
+      if (toolkit != null) {
+         toolkit.dispose();
+      }
    }
 
    public String getActionDescription() {
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectLabelProvider.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectLabelProvider.java
index a567fb30e18..5c52719f1ff 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectLabelProvider.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectLabelProvider.java
@@ -18,11 +18,8 @@ import org.eclipse.osee.ats.util.widgets.defect.DefectItem.Disposition;
 import org.eclipse.osee.ats.util.widgets.defect.DefectItem.InjectionActivity;
 import org.eclipse.osee.ats.util.widgets.defect.DefectItem.Severity;
 import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.UserManager;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
 import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
 import org.eclipse.osee.framework.ui.skynet.ImageManager;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
 import org.eclipse.osee.framework.ui.skynet.widgets.XDate;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.Image;
@@ -49,10 +46,7 @@ public class DefectLabelProvider extends XViewerLabelProvider {
       else if (dCol.equals(DefectXViewerFactory.Closed_Col)) {
          return defectItem.isClosed() ? ImageManager.getImage(FrameworkImage.CHECKBOX_ENABLED) : ImageManager.getImage(FrameworkImage.CHECKBOX_DISABLED);
       } else if (dCol.equals(DefectXViewerFactory.User_Col)) {
-         if (defectItem.getUser().equals(UserManager.getUser()))
-            return ImageManager.getImage(FrameworkImage.USER_SM_RED);
-         else
-            return ImageManager.getImage(ArtifactTypeManager.getType("User"));
+         return ImageManager.getImage(defectItem.getUser());
       }
       return null;
    }
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleLabelProvider.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleLabelProvider.java
index 15b6fccc16d..4cd432a7fbc 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleLabelProvider.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleLabelProvider.java
@@ -17,8 +17,6 @@ import org.eclipse.osee.ats.AtsImage;
 import org.eclipse.osee.ats.util.AtsLib;
 import org.eclipse.osee.ats.util.widgets.defect.DefectItem.Severity;
 import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.UserManager;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
 import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
 import org.eclipse.osee.framework.ui.skynet.ImageManager;
 import org.eclipse.swt.graphics.Font;
@@ -38,10 +36,7 @@ public class UserRoleLabelProvider extends XViewerLabelProvider {
    public Image getColumnImage(Object element, XViewerColumn dCol, int columnIndex) throws OseeCoreException {
       UserRole roleItem = (UserRole) element;
       if (dCol.equals(UserRoleXViewerFactory.User_Col)) {
-         if (roleItem.getUser().equals(UserManager.getUser()))
-            return ImageManager.getImage(FrameworkImage.USER_SM_RED);
-         else
-            return ImageManager.getImage(ArtifactTypeManager.getType("User"));
+         return ImageManager.getImage(roleItem.getUser());
       } else if (dCol.equals(UserRoleXViewerFactory.Role_Col)) {
          return ImageManager.getImage(AtsImage.ROLE);
       } else if (dCol.equals(UserRoleXViewerFactory.Hours_Spent_Col)) {
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyOrigSearchItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyOrigSearchItem.java
index ba17ab8c511..6f18f2d35a5 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyOrigSearchItem.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyOrigSearchItem.java
@@ -34,7 +34,7 @@ public class MyOrigSearchItem extends UserSearchItem {
    };
 
    public MyOrigSearchItem(String name, User user, OriginatedState originatedState) {
-      super(name, user, FrameworkImage.USER);
+      super(name, user, FrameworkImage.USER_PURPLE);
       this.originatedState = originatedState;
    }
 
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/UserSearchItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/UserSearchItem.java
index 97d60b4805d..881251d96aa 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/UserSearchItem.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/UserSearchItem.java
@@ -162,7 +162,7 @@ public abstract class UserSearchItem extends WorldUISearchItem {
    public Image getImage() {
       Image image = super.getImage();
       if (image != null) return image;
-      return ImageManager.getImage(FrameworkImage.USER);
+      return ImageManager.getImage(FrameworkImage.USER_PURPLE);
    }
 
 }
diff --git a/org.eclipse.osee.framework.skynet.core/plugin.xml b/org.eclipse.osee.framework.skynet.core/plugin.xml
index 1d0dce5fa29..a22e836d77f 100644
--- a/org.eclipse.osee.framework.skynet.core/plugin.xml
+++ b/org.eclipse.osee.framework.skynet.core/plugin.xml
@@ -46,10 +46,6 @@
                ImagePath="images/narrative.gif">

          </ArtifactImage>

          <ArtifactImage

-               ArtifactTypeName="User"

-               ImagePath="images/user.gif">

-         </ArtifactImage>

-         <ArtifactImage

                ArtifactTypeName="Folder"

                ImagePath="images/folder.gif">

          </ArtifactImage>

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/User.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/User.java
index 3203f1072a9..b9f4d79e033 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/User.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/User.java
@@ -17,6 +17,7 @@ import java.io.StringReader;
 import java.io.StringWriter;
 import java.util.Collection;
 import java.util.HashSet;
+import org.eclipse.osee.framework.core.data.SystemUser;
 import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
 import org.eclipse.osee.framework.db.connection.exception.OseeWrappedException;
 import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
@@ -192,4 +193,12 @@ public class User extends Artifact implements Serializable {
          }
       }
    }
+
+   public boolean isSystemUser() throws OseeCoreException {
+      if (this.equals(UserManager.getUser(SystemUser.OseeSystem)) || this.equals(UserManager.getUser(SystemUser.UnAssigned)) || this.equals(UserManager.getUser(SystemUser.Guest))) {
+         return true;
+      }
+      return false;
+   }
+
 }
diff --git a/org.eclipse.osee.framework.ui.skynet/images/user.gif b/org.eclipse.osee.framework.ui.skynet/images/user.gif
deleted file mode 100644
index 5e6e549598a..00000000000
--- a/org.eclipse.osee.framework.ui.skynet/images/user.gif
+++ /dev/null
diff --git a/org.eclipse.osee.framework.ui.skynet/images/userGrey.gif b/org.eclipse.osee.framework.ui.skynet/images/userGrey.gif
new file mode 100644
index 00000000000..b455f7388f1
--- /dev/null
+++ b/org.eclipse.osee.framework.ui.skynet/images/userGrey.gif
diff --git a/org.eclipse.osee.framework.ui.skynet/images/userPurple.gif b/org.eclipse.osee.framework.ui.skynet/images/userPurple.gif
new file mode 100644
index 00000000000..de2e9c12e1c
--- /dev/null
+++ b/org.eclipse.osee.framework.ui.skynet/images/userPurple.gif
diff --git a/org.eclipse.osee.framework.ui.skynet/images/userRed.gif b/org.eclipse.osee.framework.ui.skynet/images/userRed.gif
new file mode 100644
index 00000000000..f91ca279748
--- /dev/null
+++ b/org.eclipse.osee.framework.ui.skynet/images/userRed.gif
diff --git a/org.eclipse.osee.framework.ui.skynet/images/userYellow.gif b/org.eclipse.osee.framework.ui.skynet/images/userYellow.gif
new file mode 100644
index 00000000000..cd59cca184b
--- /dev/null
+++ b/org.eclipse.osee.framework.ui.skynet/images/userYellow.gif
diff --git a/org.eclipse.osee.framework.ui.skynet/images/user_sm.gif b/org.eclipse.osee.framework.ui.skynet/images/user_sm.gif
deleted file mode 100644
index d2780011574..00000000000
--- a/org.eclipse.osee.framework.ui.skynet/images/user_sm.gif
+++ /dev/null
diff --git a/org.eclipse.osee.framework.ui.skynet/plugin.xml b/org.eclipse.osee.framework.ui.skynet/plugin.xml
index 5956c0eb8b5..ffe95c0cf91 100644
--- a/org.eclipse.osee.framework.ui.skynet/plugin.xml
+++ b/org.eclipse.osee.framework.ui.skynet/plugin.xml
@@ -1788,4 +1788,10 @@
            className="org.eclipse.osee.framework.ui.skynet.dbHealth.WordAttributeTrackChangeHealthOperation">

      </DatabaseHealthOperation>

   </extension>

+    <extension

+          point="org.eclipse.osee.framework.ui.skynet.ArtifactImageProvider">

+       <ArtifactImageProvider

+             class="org.eclipse.osee.framework.ui.skynet.UserArtifactImageProvider">

+       </ArtifactImageProvider>

+    </extension>

 </plugin>

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/FrameworkImage.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/FrameworkImage.java
index a2930fa5619..8ef23b39136 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/FrameworkImage.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/FrameworkImage.java
@@ -131,9 +131,12 @@ public enum FrameworkImage implements OseeImage {
    TRASH("trash.gif"),
    SKYWALKER("skywalker.gif"),
    SUPPORT("users2.gif"),
-   USER("user.gif"),
-   USER_SM_RED("red_user_sm.gif"),
+   USER_PURPLE("userPurple.gif"),
+   USER_RED("userRed.gif"),
+   USER_GREY("userGrey.gif"),
+   USER_YELLOW("userYellow.gif"),
    USER_ADD("userAdd.gif"),
+   USERS("user2.gif"),
    UN_ARCHIVE("unarchive.gif"),
    VERSION("version.gif"),
    WARNING("warn.gif"),
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SessionContributionItem.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SessionContributionItem.java
index 3be824c76fe..4b2ba6fe0d4 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SessionContributionItem.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SessionContributionItem.java
@@ -39,7 +39,7 @@ public class SessionContributionItem extends OseeContributionItem implements IAc
    private static final String ID = "session.contribution.item";
 
    private static final Image DISABLED_IMAGE =
-         new OverlayImage(ImageManager.getImage(FrameworkImage.USER),
+         new OverlayImage(ImageManager.getImage(FrameworkImage.USER_PURPLE),
                ImageManager.getImageDescriptor(FrameworkImage.SLASH_RED_OVERLAY)).createImage();
 
    private static String ENABLED_TOOLTIP = "Authenticated as: %s (%s) - session(%s)\nDouble-Click to Log Off.";
@@ -149,7 +149,7 @@ public class SessionContributionItem extends OseeContributionItem implements IAc
     */
    @Override
    protected Image getEnabledImage() {
-      return ImageManager.getImage(FrameworkImage.USER);
+      return ImageManager.getImage(FrameworkImage.USER_PURPLE);
    }
 
    /* (non-Javadoc)
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/UserArtifactImageProvider.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/UserArtifactImageProvider.java
new file mode 100644
index 00000000000..ae7821052ce
--- /dev/null
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/UserArtifactImageProvider.java
@@ -0,0 +1,45 @@
+/*
+ * Created on Jun 8, 2009
+ *
+ * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE
+ */
+package org.eclipse.osee.framework.ui.skynet;
+
+import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
+import org.eclipse.osee.framework.skynet.core.User;
+import org.eclipse.osee.framework.skynet.core.UserManager;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * @author Donald G. Dunne
+ */
+public class UserArtifactImageProvider extends ArtifactImageProvider {
+
+   /* (non-Javadoc)
+    * @see org.eclipse.osee.framework.ui.skynet.ArtifactImageProvider#init()
+    */
+   @Override
+   public void init() throws OseeCoreException {
+      ImageManager.registerProvider(this, ArtifactTypeManager.getType("User"));
+   }
+
+   /* (non-Javadoc)
+    * @see org.eclipse.osee.framework.ui.skynet.ArtifactImageProvider#getImage(org.eclipse.osee.framework.skynet.core.artifact.Artifact)
+    */
+   @Override
+   public Image getImage(Artifact artifact) throws OseeCoreException {
+      if (artifact.isDeleted()) {
+         return ImageManager.getImage(ArtifactTypeManager.getType(User.ARTIFACT_NAME));
+      } else if (((User) artifact).isSystemUser()) {
+         ImageManager.getImage(FrameworkImage.USER_GREY);
+      } else if (!((User) artifact).isActive()) {
+         ImageManager.getImage(FrameworkImage.USER_YELLOW);
+      } else if (((User) artifact).equals(UserManager.getUser())) {
+         ImageManager.getImage(FrameworkImage.USER_RED);
+      }
+      return ImageManager.getImage(artifact);
+   }
+
+}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/AttributeFindReplaceDialog.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/AttributeFindReplaceDialog.java
index 39eb3bd2df3..33435341d37 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/AttributeFindReplaceDialog.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/AttributeFindReplaceDialog.java
@@ -178,14 +178,14 @@ public class AttributeFindReplaceDialog extends Dialog {
                   artifact.persistAttributes(transaction);

                   monitor.worked(1);

                   if (monitor.isCanceled()) {

-                     throw new IllegalStateException("USER CANCELLED");

+                     throw new IllegalStateException("USER_PURPLE CANCELLED");

                   }

                }

 

                transaction.execute();

                toReturn = Status.OK_STATUS;

             } catch (Exception ex) {

-               if (ex.getMessage().equals("USER CANCELLED")) {

+               if (ex.getMessage().equals("USER_PURPLE CANCELLED")) {

                   toReturn = Status.CANCEL_STATUS;

                } else {

                   toReturn = new Status(Status.ERROR, SkynetGuiPlugin.PLUGIN_ID, Status.OK, ex.getMessage(), ex);