diff options
8 files changed, 30 insertions, 36 deletions
diff --git a/bundles/org.eclipse.compare/META-INF/MANIFEST.MF b/bundles/org.eclipse.compare/META-INF/MANIFEST.MF index d6d61b11e..f91b58fea 100644 --- a/bundles/org.eclipse.compare/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.compare/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.compare; singleton:=true -Bundle-Version: 3.1.0 +Bundle-Version: 3.1.1 Bundle-Activator: org.eclipse.compare.internal.CompareUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java index dbca46533..d23b612a3 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java @@ -515,20 +515,13 @@ public final class CompareUIPlugin extends AbstractUIPlugin { } public static ImageDescriptor getImageDescriptor(String relativePath) { - - URL installURL= null; - if (fgComparePlugin != null) - installURL= fgComparePlugin.getBundle().getEntry("/"); //$NON-NLS-1$ - - if (installURL != null) { - try { - URL url= new URL(installURL, Utilities.getIconPath(null) + relativePath); - return ImageDescriptor.createFromURL(url); - } catch (MalformedURLException e) { - Assert.isTrue(false); - } - } - return null; + if (fgComparePlugin == null) + return null; + IPath path= Utilities.getIconPath(null).append(relativePath); + URL url= Platform.find(fgComparePlugin.getBundle(), path); + if (url == null) + return null; + return ImageDescriptor.createFromURL(url); } /** diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java index 55cb1604c..5ccb92070 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java @@ -31,8 +31,10 @@ import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.MultiStatus; +import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; import org.eclipse.ui.*; @@ -47,6 +49,8 @@ import org.eclipse.compare.IStreamContentAccessor; */ public class Utilities { + private static final IPath ICONS_PATH= new Path("$nl$/icons/full/"); //$NON-NLS-1$ + public static void registerAction(IKeyBindingService kbs, IAction a, String id) { if (kbs != null) { a.setActionDefinitionId(id); @@ -186,8 +190,8 @@ public class Utilities { return bos.toByteArray(); } - public static String getIconPath(Display display) { - return "icons/full/"; //$NON-NLS-1$ + public static IPath getIconPath(Display display) { + return ICONS_PATH; } /* diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/META-INF/MANIFEST.MF b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/META-INF/MANIFEST.MF index d6d61b11e..f91b58fea 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.compare; singleton:=true -Bundle-Version: 3.1.0 +Bundle-Version: 3.1.1 Bundle-Activator: org.eclipse.compare.internal.CompareUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java index dbca46533..d23b612a3 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java @@ -515,20 +515,13 @@ public final class CompareUIPlugin extends AbstractUIPlugin { } public static ImageDescriptor getImageDescriptor(String relativePath) { - - URL installURL= null; - if (fgComparePlugin != null) - installURL= fgComparePlugin.getBundle().getEntry("/"); //$NON-NLS-1$ - - if (installURL != null) { - try { - URL url= new URL(installURL, Utilities.getIconPath(null) + relativePath); - return ImageDescriptor.createFromURL(url); - } catch (MalformedURLException e) { - Assert.isTrue(false); - } - } - return null; + if (fgComparePlugin == null) + return null; + IPath path= Utilities.getIconPath(null).append(relativePath); + URL url= Platform.find(fgComparePlugin.getBundle(), path); + if (url == null) + return null; + return ImageDescriptor.createFromURL(url); } /** diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java index 55cb1604c..5ccb92070 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java @@ -31,8 +31,10 @@ import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.MultiStatus; +import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; import org.eclipse.ui.*; @@ -47,6 +49,8 @@ import org.eclipse.compare.IStreamContentAccessor; */ public class Utilities { + private static final IPath ICONS_PATH= new Path("$nl$/icons/full/"); //$NON-NLS-1$ + public static void registerAction(IKeyBindingService kbs, IAction a, String id) { if (kbs != null) { a.setActionDefinitionId(id); @@ -186,8 +190,8 @@ public class Utilities { return bos.toByteArray(); } - public static String getIconPath(Display display) { - return "icons/full/"; //$NON-NLS-1$ + public static IPath getIconPath(Display display) { + return ICONS_PATH; } /* diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/scripts/exportplugin.xml b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/scripts/exportplugin.xml index 7e8dffdfa..7e9ce3664 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/scripts/exportplugin.xml +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/scripts/exportplugin.xml @@ -4,7 +4,7 @@ <property name="destdir" value="../../plugin-export" /> <property name="tempdir" value="../../tmp" /> <property name="plugin" value="org.eclipse.compare" /> - <property name="plugin_version" value="_3.1.0" /> + <property name="plugin_version" value="_3.1.1" /> <property name="dest" value="${destdir}/${plugin}${plugin_version}" /> <property name="destjar" value="${destdir}/${plugin}${plugin_version}.jar" /> </target> diff --git a/bundles/org.eclipse.compare/scripts/exportplugin.xml b/bundles/org.eclipse.compare/scripts/exportplugin.xml index 7e8dffdfa..7e9ce3664 100644 --- a/bundles/org.eclipse.compare/scripts/exportplugin.xml +++ b/bundles/org.eclipse.compare/scripts/exportplugin.xml @@ -4,7 +4,7 @@ <property name="destdir" value="../../plugin-export" /> <property name="tempdir" value="../../tmp" /> <property name="plugin" value="org.eclipse.compare" /> - <property name="plugin_version" value="_3.1.0" /> + <property name="plugin_version" value="_3.1.1" /> <property name="dest" value="${destdir}/${plugin}${plugin_version}" /> <property name="destjar" value="${destdir}/${plugin}${plugin_version}.jar" /> </target> |