Attachment #25523 for bug #105230

Lines 2-8 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %pluginName	3	Bundle-Name: %pluginName
4	Bundle-SymbolicName: org.eclipse.compare; singleton:=true	4	Bundle-SymbolicName: org.eclipse.compare; singleton:=true
5	Bundle-Version: 3.1.0	5	Bundle-Version: 3.1.1
6	Bundle-Activator: org.eclipse.compare.internal.CompareUIPlugin	6	Bundle-Activator: org.eclipse.compare.internal.CompareUIPlugin
7	Bundle-Vendor: %providerName	7	Bundle-Vendor: %providerName
8	Bundle-Localization: plugin	8	Bundle-Localization: plugin




	}
	
	public static ImageDescriptor getImageDescriptor(String relativePath) {
		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);
				URL url= new URL(installURL, Utilities.getIconPath(null) + relativePath);
				return ImageDescriptor.createFromURL(url);
			} catch (MalformedURLException e) {
				Assert.isTrue(false);
			}
		}
		return null;
	}
	
	/**

Lines 31-38 Link Here

(-)compare/org/eclipse/compare/internal/Utilities.java (-2 / +6 lines)
31	import org.eclipse.core.resources.IResource;	31	import org.eclipse.core.resources.IResource;
32	import org.eclipse.core.runtime.CoreException;	32	import org.eclipse.core.runtime.CoreException;
33	import org.eclipse.core.runtime.IAdaptable;	33	import org.eclipse.core.runtime.IAdaptable;
		34	import org.eclipse.core.runtime.IPath;
34	import org.eclipse.core.runtime.IStatus;	35	import org.eclipse.core.runtime.IStatus;
35	import org.eclipse.core.runtime.MultiStatus;	36	import org.eclipse.core.runtime.MultiStatus;
		37	import org.eclipse.core.runtime.Path;
36	import org.eclipse.core.runtime.Status;	38	import org.eclipse.core.runtime.Status;
37		39
38	import org.eclipse.ui.*;	40	import org.eclipse.ui.*;
Lines 47-52 Link Here
47	*/	49	*/
48	public class Utilities {	50	public class Utilities {
49		51
		52	private static final IPath ICONS_PATH= new Path("$nl$/icons/full/"); //$NON-NLS-1$
		53
50	public static void registerAction(IKeyBindingService kbs, IAction a, String id) {	54	public static void registerAction(IKeyBindingService kbs, IAction a, String id) {
51	if (kbs != null) {	55	if (kbs != null) {
52	a.setActionDefinitionId(id);	56	a.setActionDefinitionId(id);
Lines 186-193 Link Here
186	return bos.toByteArray();	190	return bos.toByteArray();
187	}	191	}
188		192
189	public static String getIconPath(Display display) {	193	public static IPath getIconPath(Display display) {
190	return "icons/full/"; //$NON-NLS-1$	194	return ICONS_PATH;
191	}	195	}
192		196
193	/*	197	/*

Lines 4-10 Link Here

(-)scripts/exportplugin.xml (-1 / +1 lines)
4	<property name="destdir" value="../../plugin-export" />	4	<property name="destdir" value="../../plugin-export" />
5	<property name="tempdir" value="../../tmp" />	5	<property name="tempdir" value="../../tmp" />
6	<property name="plugin" value="org.eclipse.compare" />	6	<property name="plugin" value="org.eclipse.compare" />
7	<property name="plugin_version" value="_3.1.0" />	7	<property name="plugin_version" value="_3.1.1" />
8	<property name="dest" value="${destdir}/${plugin}${plugin_version}" />	8	<property name="dest" value="${destdir}/${plugin}${plugin_version}" />
9	<property name="destjar" value="${destdir}/${plugin}${plugin_version}.jar" />	9	<property name="destjar" value="${destdir}/${plugin}${plugin_version}.jar" />
10	</target>	10	</target>

Return to bug 105230

Lines 515-534 Link Here

(-)compare/org/eclipse/compare/internal/CompareUIPlugin.java (-14 / +7 lines)
515	}	515	}
516		516
517	public static ImageDescriptor getImageDescriptor(String relativePath) {	517	public static ImageDescriptor getImageDescriptor(String relativePath) {
518		518	if (fgComparePlugin == null)
519	URL installURL= null;	519	return null;
520	if (fgComparePlugin != null)	520	IPath path= Utilities.getIconPath(null).append(relativePath);
521	installURL= fgComparePlugin.getBundle().getEntry("/"); //$NON-NLS-1$	521	URL url= Platform.find(fgComparePlugin.getBundle(), path);
522		522	if (url == null)
523	if (installURL != null) {	523	return null;
524	try {	524	return ImageDescriptor.createFromURL(url);
525	URL url= new URL(installURL, Utilities.getIconPath(null) + relativePath);
526	return ImageDescriptor.createFromURL(url);
527	} catch (MalformedURLException e) {
528	Assert.isTrue(false);
529	}
530	}
531	return null;
532	}	525	}
533		526
534	/**	527	/**