Attachment 25523 Details for Bug 105230 – first patch (w/o plugin.xml)

[patch] first patch (w/o plugin.xml)

105230.txt (text/plain), 3.94 KB, created by Andre Weinand

on 2005-08-01 15:37:23 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andre Weinand

Created: 2005-08-01 15:37:23 EDT

Size: 3.94 KB

patch

obsolete

>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /home/eclipse/org.eclipse.compare/META-INF/MANIFEST.MF,v
>retrieving revision 1.3
>diff -u -r1.3 MANIFEST.MF
>--- META-INF/MANIFEST.MF	1 Jun 2005 22:20:25 -0000	1.3
>+++ META-INF/MANIFEST.MF	1 Aug 2005 19:34:53 -0000
>@@ -2,7 +2,7 @@
> 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
>Index: compare/org/eclipse/compare/internal/CompareUIPlugin.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java,v
>retrieving revision 1.56
>diff -u -r1.56 CompareUIPlugin.java
>--- compare/org/eclipse/compare/internal/CompareUIPlugin.java	9 May 2005 10:08:06 -0000	1.56
>+++ compare/org/eclipse/compare/internal/CompareUIPlugin.java	1 Aug 2005 19:34:54 -0000
>@@ -515,20 +515,13 @@
> 	}
> 	
> 	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);
> 	}
> 	
> 	/**
>Index: compare/org/eclipse/compare/internal/Utilities.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java,v
>retrieving revision 1.38
>diff -u -r1.38 Utilities.java
>--- compare/org/eclipse/compare/internal/Utilities.java	24 Feb 2005 21:59:09 -0000	1.38
>+++ compare/org/eclipse/compare/internal/Utilities.java	1 Aug 2005 19:34:55 -0000
>@@ -31,8 +31,10 @@
> 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 @@
>  */
> 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 @@
> 		return bos.toByteArray();
> 	}
> 
>-	public static String getIconPath(Display display) {
>-		return "icons/full/";	//$NON-NLS-1$
>+	public static IPath getIconPath(Display display) {
>+		return ICONS_PATH;
> 	}
> 	
> 	/*
>Index: scripts/exportplugin.xml
>===================================================================
>RCS file: /home/eclipse/org.eclipse.compare/scripts/exportplugin.xml,v
>retrieving revision 1.14
>diff -u -r1.14 exportplugin.xml
>--- scripts/exportplugin.xml	6 Jul 2005 09:38:55 -0000	1.14
>+++ scripts/exportplugin.xml	1 Aug 2005 19:34:55 -0000
>@@ -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>

Actions: View | Diff

Attachments on bug 105230: 25459 | 25460 | 25523 | 25610