Attachment 25460 Details for Bug 105230 – Patch which increases version numbers as well.

[patch] Patch which increases version numbers as well.

105230.patch (text/plain), 10.31 KB, created by Dirk Baeumer

on 2005-07-29 06:33:34 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Dirk Baeumer

Created: 2005-07-29 06:33:34 EDT

Size: 10.31 KB

patch

obsolete

>Index: plugin.xml
>===================================================================
>RCS file: /home/eclipse/org.eclipse.compare/plugin.xml,v
>retrieving revision 1.57
>diff -u -r1.57 plugin.xml
>--- plugin.xml	9 May 2005 16:20:33 -0000	1.57
>+++ plugin.xml	29 Jul 2005 10:29:50 -0000
>@@ -78,7 +78,7 @@
>          point="org.eclipse.ui.editors">
>       <editor
>             name="%defaultCompareEditor.name"
>-            icon="icons/full/eview16/compare_view.gif"
>+            icon="$nl$/icons/full/eview16/compare_view.gif"
>             contributorClass="org.eclipse.compare.internal.CompareEditorContributor"
>             class="org.eclipse.compare.internal.CompareEditor"
>             id="org.eclipse.compare.CompareEditor">
>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	29 Jul 2005 10:29:50 -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	29 Jul 2005 10:29:51 -0000
>@@ -10,32 +10,67 @@
>  *******************************************************************************/
> package org.eclipse.compare.internal;
> 
>-import java.io.*;
>+import java.io.BufferedInputStream;
>+import java.io.IOException;
>+import java.io.InputStream;
> import java.lang.reflect.InvocationTargetException;
>-import java.net.*;
>-import java.util.*;
>+import java.net.URL;
>+import java.util.ArrayList;
>+import java.util.HashMap;
>+import java.util.HashSet;
>+import java.util.Hashtable;
>+import java.util.Iterator;
> import java.util.List;
>-
>-import org.eclipse.ui.*;
>-import org.eclipse.ui.model.IWorkbenchAdapter;
>-import org.eclipse.ui.plugin.AbstractUIPlugin;
>-
>-import org.eclipse.core.runtime.*;
>+import java.util.Map;
>+import java.util.ResourceBundle;
>+import java.util.Set;
>+import java.util.StringTokenizer;
>+
>+import org.eclipse.compare.CompareConfiguration;
>+import org.eclipse.compare.CompareEditorInput;
>+import org.eclipse.compare.IStreamContentAccessor;
>+import org.eclipse.compare.IStreamMerger;
>+import org.eclipse.compare.ITypedElement;
>+import org.eclipse.compare.structuremergeviewer.ICompareInput;
>+import org.eclipse.compare.structuremergeviewer.IStructureCreator;
>+import org.eclipse.compare.structuremergeviewer.StructureDiffViewer;
>+
>+import org.eclipse.core.runtime.CoreException;
>+import org.eclipse.core.runtime.IAdaptable;
>+import org.eclipse.core.runtime.IConfigurationElement;
>+import org.eclipse.core.runtime.IExtensionRegistry;
>+import org.eclipse.core.runtime.IPath;
>+import org.eclipse.core.runtime.IStatus;
>+import org.eclipse.core.runtime.Platform;
>+import org.eclipse.core.runtime.Status;
> import org.eclipse.core.runtime.content.IContentType;
> import org.eclipse.core.runtime.content.IContentTypeManager;
> 
> import org.eclipse.swt.graphics.Image;
>-import org.eclipse.swt.widgets.*;
>+import org.eclipse.swt.widgets.Composite;
>+import org.eclipse.swt.widgets.Shell;
> 
>-import org.eclipse.jface.dialogs.*;
>+import org.eclipse.jface.dialogs.MessageDialog;
> import org.eclipse.jface.preference.IPreferenceStore;
> import org.eclipse.jface.resource.ImageDescriptor;
>-import org.eclipse.jface.util.*;
> import org.eclipse.jface.util.Assert;
>+import org.eclipse.jface.util.IPropertyChangeListener;
>+import org.eclipse.jface.util.PropertyChangeEvent;
> import org.eclipse.jface.viewers.Viewer;
> 
>-import org.eclipse.compare.*;
>-import org.eclipse.compare.structuremergeviewer.*;
>+import org.eclipse.ui.IEditorInput;
>+import org.eclipse.ui.IEditorPart;
>+import org.eclipse.ui.IEditorRegistry;
>+import org.eclipse.ui.IReusableEditor;
>+import org.eclipse.ui.ISharedImages;
>+import org.eclipse.ui.IWorkbench;
>+import org.eclipse.ui.IWorkbenchPage;
>+import org.eclipse.ui.IWorkbenchWindow;
>+import org.eclipse.ui.PartInitException;
>+import org.eclipse.ui.PlatformUI;
>+import org.eclipse.ui.model.IWorkbenchAdapter;
>+import org.eclipse.ui.plugin.AbstractUIPlugin;
>+
> import org.osgi.framework.BundleContext;
> 
> 
>@@ -515,20 +550,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	29 Jul 2005 10:29:52 -0000
>@@ -10,43 +10,68 @@
>  *******************************************************************************/
> package org.eclipse.compare.internal;
> 
>-import java.io.*;
>+import java.io.BufferedReader;
>+import java.io.ByteArrayOutputStream;
>+import java.io.IOException;
>+import java.io.InputStream;
>+import java.io.InputStreamReader;
>+import java.io.UnsupportedEncodingException;
> import java.text.MessageFormat;
>-import java.util.*;
>+import java.util.ArrayList;
>+import java.util.HashMap;
>+import java.util.Iterator;
> import java.util.List;
>+import java.util.Map;
>+import java.util.MissingResourceException;
>+import java.util.ResourceBundle;
> 
>-import org.eclipse.swt.widgets.*;
>-
>-import org.eclipse.core.resources.IEncodedStorage;
>-import org.eclipse.core.resources.IFile;
>-import org.eclipse.core.resources.ResourceAttributes;
>-import org.eclipse.core.resources.ResourcesPlugin;
>-
>-import org.eclipse.jface.action.IAction;
>-import org.eclipse.jface.resource.ImageDescriptor;
>-import org.eclipse.jface.util.*;
>-import org.eclipse.jface.viewers.*;
>-import org.eclipse.jface.dialogs.ErrorDialog;
>+import org.eclipse.compare.CompareConfiguration;
>+import org.eclipse.compare.CompareUI;
>+import org.eclipse.compare.IEncodedStreamContentAccessor;
>+import org.eclipse.compare.IStreamContentAccessor;
> 
>-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.*;
>+import org.eclipse.core.resources.IEncodedStorage;
>+import org.eclipse.core.resources.IFile;
>+import org.eclipse.core.resources.IResource;
>+import org.eclipse.core.resources.ResourceAttributes;
>+import org.eclipse.core.resources.ResourcesPlugin;
> 
>-import org.eclipse.compare.CompareConfiguration;
>-import org.eclipse.compare.CompareUI;
>-import org.eclipse.compare.IEncodedStreamContentAccessor;
>-import org.eclipse.compare.IStreamContentAccessor;
>+import org.eclipse.swt.widgets.Composite;
>+import org.eclipse.swt.widgets.Control;
>+import org.eclipse.swt.widgets.Display;
>+import org.eclipse.swt.widgets.Shell;
>+import org.eclipse.swt.widgets.Widget;
>+
>+import org.eclipse.jface.action.IAction;
>+import org.eclipse.jface.dialogs.ErrorDialog;
>+import org.eclipse.jface.resource.ImageDescriptor;
>+import org.eclipse.jface.util.IPropertyChangeListener;
>+import org.eclipse.jface.util.ListenerList;
>+import org.eclipse.jface.util.PropertyChangeEvent;
>+import org.eclipse.jface.viewers.ISelection;
>+import org.eclipse.jface.viewers.IStructuredSelection;
>+
>+import org.eclipse.ui.IActionBars;
>+import org.eclipse.ui.IKeyBindingService;
>+import org.eclipse.ui.IViewPart;
>+import org.eclipse.ui.IWorkbenchPart;
>+import org.eclipse.ui.IWorkbenchPartSite;
> 
> /**
>  * Convenience and utility methods.
>  */
> 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 +211,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.13
>diff -u -r1.13 exportplugin.xml
>--- scripts/exportplugin.xml	14 Apr 2005 10:54:35 -0000	1.13
>+++ scripts/exportplugin.xml	29 Jul 2005 10:29:52 -0000
>@@ -4,8 +4,8 @@
> 		<property name="destdir" value="../../plugin-export" />
> 		<property name="tempdir" value="../../tmp" />
> 		<property name="plugin"  value="org.eclipse.compare" />
>-		<property name="dest"  value="${destdir}/${plugin}_3.1.0" />
>-		<property name="destjar"  value="${destdir}/${plugin}_3.1.0.jar" />
>+		<property name="dest"  value="${destdir}/${plugin}_3.1.1" />
>+		<property name="destjar"  value="${destdir}/${plugin}_3.1.1.jar" />
> 	</target>
> 
> 	<target name="build" depends="init">

Actions: View | Diff

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