"Team Workflow" - U2PFN - "Duplicate image loading among plugins causing memory problems"

4 files changed, 55 insertions, 31 deletions

diff --git a/org.eclipse.osee.ats/plugin.xml b/org.eclipse.osee.ats/plugin.xml
index 733c52a0c3b..5b0f4611269 100644
--- a/org.eclipse.osee.ats/plugin.xml
+++ b/org.eclipse.osee.ats/plugin.xml
@@ -198,12 +198,6 @@
             ArtifactTypeName="Action"

             ImagePath="images/action.gif"/>

       <ArtifactImage

-            ArtifactTypeName="Review"

-            ImagePath="images/R.gif"/>

-      <ArtifactImage

-            ArtifactTypeName="Reviewer"

-            ImagePath="images/reviewer.gif"/>

-      <ArtifactImage

             ArtifactTypeName="Version"

             ImagePath="images/version.gif"/>

       <ArtifactImage

@@ -213,9 +207,6 @@
             ArtifactTypeName="Actionable Item"

             ImagePath="images/AI.gif"/>

       <ArtifactImage

-            ArtifactTypeName="Universal Group"

-            ImagePath="images/group.gif"/>

-      <ArtifactImage

             ArtifactTypeName="Team Workflow"

             ImagePath="images/workflow.gif"/>

       <ArtifactImage

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/AtsImage.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/AtsImage.java
index fbe6b4ee8db..ee54b983c4a 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/AtsImage.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/AtsImage.java
@@ -28,7 +28,7 @@ public enum AtsImage implements OseeImage {
    COPY_TO_CLIPBOARD("copyToClipboard.gif"),
    CUSTOMIZE("customize.gif"),
    DOWN_TRIANGLE("downTriangle.gif"),
-   ELLIPSE_ICON("ellipse16.gif"),
+   ELLIPSE_ICON("ellipasfse16.gif"),
    FAVORITE("star.gif"),
    FAVORITE_OVERLAY("favorite.gif"),
    GLOBE("globe.gif"),
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeManager.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeManager.java
index 11b54a62563..b98a2003e8e 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeManager.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeManager.java
@@ -253,17 +253,7 @@ public class ArtifactTypeManager {
 

       InputStream imageStream = null;

       try {

-         Pair<String, String> imagelocation = imageMap.get(typeName);

-         if (imagelocation != null) {

-            URL url = getUrl(imagelocation);

-            if (url == null) {

-               OseeLog.log(Activator.class, Level.WARNING, String.format(

-                     "Unable to get url for type [%s] bundle [%s] file [%s] ", typeName, imagelocation.getKey(),

-                     imagelocation.getValue()));

-            } else {

-               imageStream = url.openStream();

-            }

-         }

+         imageStream = getInputStreamForImage(typeName);

       } catch (Exception ex) {

          OseeLog.log(Activator.class, Level.SEVERE, "Icon for Artifact type " + typeName + " not found.", ex);

       }

@@ -271,9 +261,41 @@ public class ArtifactTypeManager {
       return imageStream;

    }

 

-   /**

-    * 

+   /*

+    * For Testing purposes only.  If sb empty, no errors.

     */

+   public static void testArtifactTypeImageLoading(StringBuffer sb) throws OseeCoreException {

+      instance.loadImageData();

+      for (String typeName : instance.imageMap.keySet()) {

+         Pair<String, String> imagelocation = instance.imageMap.get(typeName);

+         try {

+            InputStream inputStream = instance.getInputStreamForImage(typeName);

+            if (inputStream == null) {

+               sb.append(String.format("\nArtifactImageType image null for [%s] [%s] [%s] ", imagelocation.getKey(),

+                     typeName, imagelocation.getValue()));

+            }

+         } catch (Exception ex) {

+            sb.append(String.format("\nException loading ArtifactImageType image for [%s] [%s] [%s] ",

+                  imagelocation.getKey(), typeName, imagelocation.getValue()));

+         }

+      }

+   }

+

+   private InputStream getInputStreamForImage(String typeName) throws Exception {

+      Pair<String, String> imagelocation = imageMap.get(typeName);

+      if (imagelocation != null) {

+         URL url = getUrl(imagelocation);

+         if (url == null) {

+            OseeLog.log(Activator.class, Level.WARNING, String.format(

+                  "Unable to get url for type [%s] bundle [%s] file [%s] ", typeName, imagelocation.getKey(),

+                  imagelocation.getValue()));

+         } else {

+            return url.openStream();

+         }

+      }

+      return null;

+   }

+

    private void loadImageData() {

       if (imageMap == null) {

          imageMap = new HashMap<String, Pair<String, String>>();

@@ -363,7 +385,6 @@ public class ArtifactTypeManager {
     * 

     * @param purgeArtifactTypes

     * @param newArtifactType

-    * @return report

     * @throws OseeCoreException

     */

    public static void purgeArtifactTypesWithConversionReportOnly(StringBuffer results, Collection<ArtifactType> purgeArtifactTypes, ArtifactType newArtifactType) throws OseeCoreException {

diff --git a/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ImageManagerTest.java b/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ImageManagerTest.java
index 2695a89db6a..3531f92c09b 100644
--- a/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ImageManagerTest.java
+++ b/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ImageManagerTest.java
@@ -13,7 +13,6 @@ package org.eclipse.osee.framework.ui.skynet.test.cases;
 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertNotNull;

 import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;

 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;

@@ -33,11 +32,21 @@ public abstract class ImageManagerTest {
       this.oseeImages = oseeImages;

    }

 

+   /**

+    * Test that image that is not found, returns MISSING image

+    * 

+    * @throws Exception

+    */

    @org.junit.Test

    public void testFrameworkImageMissing() throws Exception {

       assertEquals(ImageManager.getImage(MissingImage.ACCEPT), ImageManager.getImage(FrameworkImage.MISSING));

    }

 

+   /**

+    * Test that all image enums have associated immage files. (Non return missing image)

+    * 

+    * @throws Exception

+    */

    @org.junit.Test

    public void testFrameworkImageEnums() throws Exception {

       StringBuffer sb = new StringBuffer();

@@ -52,14 +61,17 @@ public abstract class ImageManagerTest {
       assertEquals("", sb.toString());

    }

 

+   /**

+    * Test that all artifact types that have declared images via extension points, have valid image files associated

+    * 

+    * @throws Exception

+    */

    @org.junit.Test

-   public void testArtifactImage() throws Exception {

-      for (ArtifactType artifactType : ArtifactTypeManager.getAllTypes()) {

-         assertNotNull(String.format("[%s] Image not defined for artifactType [%s]", imageClassName, artifactType),

-               ImageManager.getImage(artifactType));

-      }

+   public void testArtifactTypeImageExtensionDeclarations() throws Exception {

+      StringBuffer sb = new StringBuffer();

+      ArtifactTypeManager.testArtifactTypeImageLoading(sb);

+      assertEquals("", sb.toString());

    }

-

    public enum MissingImage implements OseeImage {

       ACCEPT("nothere.gif");