Attachment 134784 Details for Bug 272528 – patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch

patch-272528.txt (text/plain), 4.00 KB, created by Boris Bokowski

on 2009-05-07 09:57:53 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Boris Bokowski

Created: 2009-05-07 09:57:53 EDT

Size: 4.00 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/internal/AbstractWorkingSetManager.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AbstractWorkingSetManager.java,v
>retrieving revision 1.37
>diff -u -r1.37 AbstractWorkingSetManager.java
>--- Eclipse UI/org/eclipse/ui/internal/AbstractWorkingSetManager.java	23 Apr 2009 17:53:04 -0000	1.37
>+++ Eclipse UI/org/eclipse/ui/internal/AbstractWorkingSetManager.java	7 May 2009 13:57:57 -0000
>@@ -24,6 +24,7 @@
> import java.util.SortedSet;
> import java.util.TreeSet;
> 
>+import org.eclipse.core.commands.common.EventManager;
> import org.eclipse.core.runtime.Assert;
> import org.eclipse.core.runtime.IAdaptable;
> import org.eclipse.core.runtime.IExtension;
>@@ -38,15 +39,11 @@
> import org.eclipse.core.runtime.dynamichelpers.IExtensionChangeHandler;
> import org.eclipse.core.runtime.dynamichelpers.IExtensionTracker;
> import org.eclipse.core.runtime.jobs.Job;
>-
>-import org.eclipse.core.commands.common.EventManager;
>-
>-import org.eclipse.swt.widgets.Display;
>-import org.eclipse.swt.widgets.Shell;
>-
> import org.eclipse.jface.util.IPropertyChangeListener;
> import org.eclipse.jface.util.PropertyChangeEvent;
>-
>+import org.eclipse.osgi.util.NLS;
>+import org.eclipse.swt.widgets.Display;
>+import org.eclipse.swt.widgets.Shell;
> import org.eclipse.ui.IElementFactory;
> import org.eclipse.ui.IMemento;
> import org.eclipse.ui.IPersistableElement;
>@@ -69,8 +66,6 @@
> import org.eclipse.ui.internal.registry.WorkingSetRegistry;
> import org.eclipse.ui.progress.WorkbenchJob;
> import org.eclipse.ui.statushandlers.StatusManager;
>-
>-import org.eclipse.osgi.util.NLS;
> import org.osgi.framework.Bundle;
> import org.osgi.framework.BundleContext;
> import org.osgi.framework.BundleEvent;
>@@ -267,7 +262,8 @@
>      * @see org.eclipse.ui.IWorkingSetManager
>      */
>     public IWorkingSet[] getWorkingSets() {
>-    		SortedSet visibleSubset = new TreeSet(WorkingSetComparator.INSTANCE);
>+		SortedSet visibleSubset = new TreeSet(WorkingSetComparator
>+				.getInstance());
>     		for (Iterator i = workingSets.iterator(); i.hasNext();) {
> 				IWorkingSet workingSet = (IWorkingSet) i.next();
> 				if (workingSet.isVisible()) {
>@@ -280,7 +276,7 @@
> 	public IWorkingSet[] getAllWorkingSets() {
> 		IWorkingSet[] sets = (IWorkingSet[]) workingSets
> 					.toArray(new IWorkingSet[workingSets.size()]);
>-		Arrays.sort(sets, WorkingSetComparator.INSTANCE);
>+		Arrays.sort(sets, WorkingSetComparator.getInstance());
> 		return sets;
> 	}
> 
>Index: Eclipse UI/org/eclipse/ui/internal/WorkingSetComparator.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSetComparator.java,v
>retrieving revision 1.12
>diff -u -r1.12 WorkingSetComparator.java
>--- Eclipse UI/org/eclipse/ui/internal/WorkingSetComparator.java	9 May 2008 14:13:13 -0000	1.12
>+++ Eclipse UI/org/eclipse/ui/internal/WorkingSetComparator.java	7 May 2009 13:57:57 -0000
>@@ -10,22 +10,27 @@
>  *******************************************************************************/
> package org.eclipse.ui.internal;
> 
>-import com.ibm.icu.text.Collator;
> import java.util.Comparator;
> 
> import org.eclipse.ui.IWorkingSet;
> 
>+import com.ibm.icu.text.Collator;
>+
> /**
>  * Compares two working sets by name.
>  */
> public class WorkingSetComparator implements Comparator {
> 	
>-	/**
>-	 * Static instance of this class.
>-	 * @since 3.2
>-	 */
>-	public static WorkingSetComparator INSTANCE = new WorkingSetComparator();
>+	private static ThreadLocal INSTANCES = new ThreadLocal() {
>+		protected synchronized Object initialValue() {
>+			return new WorkingSetComparator();
>+		}
>+	};
> 	
>+	public static WorkingSetComparator getInstance() {
>+		return (WorkingSetComparator) INSTANCES.get();
>+	}
>+
>     private Collator fCollator = Collator.getInstance();
> 
>     /**

Actions: View | Diff

Attachments on bug 272528: 133734 | 134784 | 134785