RC2 compatibility

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / externaltools / internal / model / ExternalToolsImages.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/externaltools/internal/model/ExternalToolsImages.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/externaltools/internal/model/ExternalToolsImages.java
index f83989e..24abd4b 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/externaltools/internal/model/ExternalToolsImages.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/externaltools/internal/model/ExternalToolsImages.java
@@ -20,6 +20,7 @@ import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.externaltools.internal.model.ExternalToolsPlugin;
 
 /**
  * The images provided by the external tools plugin.
@@ -42,14 +43,18 @@ public class ExternalToolsImages {
        /* Declare Common paths */
        private static URL ICON_BASE_URL= null;
 
+//     static {
+//             String pathSuffix = "icons/externaltools/full/"; //$NON-NLS-1$
+//                     
+//             try {
+//                     ICON_BASE_URL= new URL(PHPeclipsePlugin.getDefault().getDescriptor().getInstallURL(), pathSuffix);
+//             } catch (MalformedURLException e) {
+//                     // do nothing
+//             }
+//     }
        static {
-               String pathSuffix = "icons/externaltools/full/"; //$NON-NLS-1$
-                       
-               try {
-                       ICON_BASE_URL= new URL(PHPeclipsePlugin.getDefault().getDescriptor().getInstallURL(), pathSuffix);
-               } catch (MalformedURLException e) {
-                       // do nothing
-               }
+               String pathSuffix = "icons/full/"; //$NON-NLS-1$        
+               ICON_BASE_URL= ExternalToolsPlugin.getDefault().getBundle().getEntry(pathSuffix);
        }
 
        // Use IPath and toOSString to build the names to ensure they have the slashes correct