geronimo-scm mailing list archives

Author: sppatel
Date: Thu Oct  6 12:03:40 2005
New Revision: 306843

URL: http://svn.apache.org/viewcvs?rev=306843&view=rev
Log:
getImage() to use default imagedesc if override is null

Modified:
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DynamicTableSection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbLocalRefSection.java

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DynamicTableSection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DynamicTableSection.java?rev=306843&r1=306842&r2=306843&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DynamicTableSection.java
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DynamicTableSection.java
Thu Oct  6 12:03:40 2005
@@ -59,6 +59,9 @@
     protected Table table;
 
     protected TableViewer tableViewer;
+    
+    private ImageDescriptor defaultImgDesc = GeronimoUIPlugin.imageDescriptorFromPlugin(
+            "org.apache.geronimo.ui", "icons/obj16/geronimo.gif");
 
     public DynamicTableSection(Section section) {
         super(section);
@@ -272,14 +275,16 @@
 
     public Image getImage() {
         if (image == null) {
-            image = getImageDescriptor().createImage();
+            ImageDescriptor descriptor = getImageDescriptor();
+            if (descriptor == null)
+                descriptor = defaultImgDesc;
+            image = descriptor.createImage();
         }
         return image;
     }
 
     public ImageDescriptor getImageDescriptor() {
-        return GeronimoUIPlugin.imageDescriptorFromPlugin(
-                "org.apache.geronimo.ui", "icons/obj16/geronimo.gif");
+        return defaultImgDesc;
     }
 
     public TableViewer getTableViewer() {

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbLocalRefSection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbLocalRefSection.java?rev=306843&r1=306842&r2=306843&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbLocalRefSection.java
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbLocalRefSection.java
Thu Oct  6 12:03:40 2005
@@ -110,7 +110,7 @@
      */
     public ImageDescriptor getImageDescriptor() {
         return GeronimoUIPlugin.imageDescriptorFromPlugin(
-                "org.eclipse.jst.j2ee", "icons/full/obj16/ejb_local-ref_obj.gif");
+                "org.eclipse.jst.j2ee", "icons/full/obj16/ejb_local_ref_obj.gif");
     }
 
 }