Attachment 22541 Details for Bug 95285 – core patch

[patch] core patch

org.eclipse.update.core.patch (text/plain), 2.82 KB, created by Branko Tripkovic

on 2005-06-07 14:39:02 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Branko Tripkovic

Created: 2005-06-07 14:39:02 EDT

Size: 2.82 KB

patch

obsolete

>Index: src/org/eclipse/update/internal/core/InstallConfiguration.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallConfiguration.java,v
>retrieving revision 1.159
>diff -u -r1.159 InstallConfiguration.java
>--- src/org/eclipse/update/internal/core/InstallConfiguration.java	17 May 2005 19:15:28 -0000	1.159
>+++ src/org/eclipse/update/internal/core/InstallConfiguration.java	7 Jun 2005 17:45:47 -0000
>@@ -23,6 +23,7 @@
> import java.util.Hashtable;
> import java.util.Iterator;
> import java.util.Map;
>+import java.util.Set;
> 
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.IProgressMonitor;
>@@ -50,6 +51,7 @@
> import org.eclipse.update.internal.configurator.ConfigurationActivator;
> import org.eclipse.update.internal.configurator.FeatureEntry;
> import org.eclipse.update.internal.configurator.IConfigurationConstants;
>+import org.eclipse.update.internal.configurator.PlatformConfiguration;
> import org.eclipse.update.internal.configurator.SiteEntry;
> import org.eclipse.update.internal.model.ConfigurationActivityModel;
> import org.eclipse.update.internal.model.ConfiguredSiteModel;
>@@ -832,17 +834,31 @@
> 	private boolean isRestartNeeded(IPlatformConfiguration runtimeConfig) {
> 
> 		// First, create a map for faster lookups
>-		URL[] newBundlePaths = runtimeConfig.getPluginPath();
>-		HashSet newPluginsSet = new HashSet(newBundlePaths.length);
>-		for (int i=0; i<newBundlePaths.length; i++) {
>-			
>-			String pluginLocation = newBundlePaths[i].getFile();
>-			newPluginsSet.add(pluginLocation);
>+		Set newPluginsSet = null;
>+		if (runtimeConfig instanceof PlatformConfiguration) {
>+			newPluginsSet = ((PlatformConfiguration)runtimeConfig).getPluginPaths();
> 			// On windows, we will be doing case insensitive search as well, so lower it now
>-			if (isWindows)
>-				newPluginsSet.add(pluginLocation.toLowerCase());
>+			if (isWindows) {
>+				String[] newPluginsSetArray = (String[])newPluginsSet.toArray( new String[newPluginsSet.size()]);
>+				for (int i = 0; i < newPluginsSetArray.length; i++) {
>+					newPluginsSet.add(newPluginsSetArray[i].toLowerCase());
>+				}
>+			}
>+		} else {
>+			URL[] newBundlePaths = runtimeConfig.getPluginPath();
>+			newPluginsSet = new HashSet(newBundlePaths.length);
>+			for (int i=0; i<newBundlePaths.length; i++) {
>+				
>+				String pluginLocation = newBundlePaths[i].getFile();
>+				newPluginsSet.add(pluginLocation);
>+				// On windows, we will be doing case insensitive search as well, so lower it now
>+				if (isWindows)
>+					newPluginsSet.add(pluginLocation.toLowerCase());
>+			}
> 		}
> 		
>+		
>+		
> 		Bundle[] oldBundles = UpdateCore.getPlugin().getBundleContext().getBundles();
> 
> 		int offset = ConfigurationActivator.UPDATE_PREFIX.length();

Actions: View | Diff

Attachments on bug 95285: 22540 | 22541