Bug 154839 [Change Sets] Add To > ...: change set menu items are unordered

6 files changed, 55 insertions, 36 deletions

diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ChangeSetManager.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ChangeSetManager.java
index 4c567c913..96e6a7783 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ChangeSetManager.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ChangeSetManager.java
@@ -168,24 +168,6 @@ public abstract class ChangeSetManager {
     }
 
     /**
-     * Return the sorted list of active commit sets.
-     * @return the sorted list of active commit sets
-     */
-    public ChangeSet[] getSortedSets() {
-        Set sets = internalGetSets();
-        ChangeSet[] array = (ChangeSet[]) sets.toArray(new ChangeSet[sets.size()]);
-        List list = Arrays.asList(array);
-		Collections.sort(list, new Comparator(){
-			public int compare(Object a, Object b) {
-				ChangeSet ca = (ChangeSet) a;
-				ChangeSet cb = (ChangeSet) b;
-				return ca.getName().compareTo(cb.getName());
-			}
-		});
-		return (ChangeSet[]) list.toArray(new ChangeSet[]{}); 
-    }
-    
-    /**
      * Return the list of active commit sets.
      * @return the list of active commit sets
      */
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetActionProvider.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetActionProvider.java
index f37a38ce3..1865e7894 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetActionProvider.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetActionProvider.java
@@ -71,7 +71,7 @@ public class ChangeSetActionProvider extends ResourceModelActionProvider {
 			});
         }
         
-		private void createChangeSet(IDiff[] diffs) {
+		/* package */ void createChangeSet(IDiff[] diffs) {
             ActiveChangeSet set =  getChangeSetCapability().createChangeSet(getConfiguration(), diffs);
             if (set != null) {
                 getActiveChangeSetManager().add(set);
@@ -87,7 +87,7 @@ public class ChangeSetActionProvider extends ResourceModelActionProvider {
 	 * Escape a string so it can be used as an action text without '&'
 	 * being interpreted as a mnemonic. Specifically, turn each '&' into '&&'.
 	 */
-	private static String escapeActionText(String x) {
+	/* package */ static String escapeActionText(String x) {
 		// Loosely based on org.eclipse.jface.action.LegacyActionTools#removeMnemonics
 		int ampersandIndex = x.indexOf('&');
 		if (ampersandIndex == -1)
@@ -184,7 +184,7 @@ public class ChangeSetActionProvider extends ResourceModelActionProvider {
         public void run() {
             ActiveChangeSet set = getSelectedSet();
             if (set == null) return;
-            getChangeSetCapability().editChangeSet(getSynchronizePageConfiguration(), set);
+            getChangeSetCapability().editChangeSet(internalGetSynchronizePageConfiguration(), set);
         }
 	}
 	
@@ -197,7 +197,7 @@ public class ChangeSetActionProvider extends ResourceModelActionProvider {
         public void run() {
             ActiveChangeSet set = getSelectedSet();
             if (set == null) return;
-            if (MessageDialog.openConfirm(getSynchronizePageConfiguration().getSite().getShell(), TeamUIMessages.ChangeSetActionGroup_0, NLS.bind(TeamUIMessages.ChangeSetActionGroup_1, new String[] { set.getTitle() }))) { // 
+            if (MessageDialog.openConfirm(internalGetSynchronizePageConfiguration().getSite().getShell(), TeamUIMessages.ChangeSetActionGroup_0, NLS.bind(TeamUIMessages.ChangeSetActionGroup_1, new String[] { set.getTitle() }))) { // 
                 getActiveChangeSetManager().remove(set);
             }
         }
@@ -227,16 +227,16 @@ public class ChangeSetActionProvider extends ResourceModelActionProvider {
 		}
 
 		public void run() {
-			int sortCriteria = getSortCriteria(getSynchronizePageConfiguration());
+			int sortCriteria = getSortCriteria(internalGetSynchronizePageConfiguration());
 			if (isChecked() && sortCriteria != criteria) {
-			    setSortCriteria(getSynchronizePageConfiguration(), criteria);
+			    setSortCriteria(internalGetSynchronizePageConfiguration(), criteria);
 				update();
-				((SynchronizePageConfiguration)getSynchronizePageConfiguration()).getPage().getViewer().refresh();
+				((SynchronizePageConfiguration)internalGetSynchronizePageConfiguration()).getPage().getViewer().refresh();
 			}
 		}
 		
 		public void update() {
-		    setChecked(criteria == getSortCriteria(getSynchronizePageConfiguration()));
+		    setChecked(criteria == getSortCriteria(internalGetSynchronizePageConfiguration()));
 		}
 	}
 	
@@ -352,7 +352,8 @@ public class ChangeSetActionProvider extends ResourceModelActionProvider {
 	}
 	
     protected void addChangeSets(IMenuManager manager) {
-        ChangeSet[] sets = getActiveChangeSetManager().getSortedSets();
+        ChangeSet[] sets = getActiveChangeSetManager().getSets();
+        Arrays.sort(sets, new ChangeSetComparator());
         ISelection selection = getContext().getSelection();
         createChangeSet.selectionChanged(selection);
 		addToChangeSet.add(createChangeSet);
@@ -397,12 +398,12 @@ public class ChangeSetActionProvider extends ResourceModelActionProvider {
         return null;
     }
     
-    private void syncExec(final Runnable runnable) {
+    /* package */ void syncExec(final Runnable runnable) {
 		final Control ctrl = getSynchronizePageConfiguration().getPage().getViewer().getControl();
 		Utils.syncExec(runnable, ctrl);
     }
 
-	private ActiveChangeSetManager getActiveChangeSetManager() {
+	/* package */ ActiveChangeSetManager getActiveChangeSetManager() {
 		return CVSUIPlugin.getPlugin().getChangeSetManager();
 	}
 
@@ -498,7 +499,7 @@ public class ChangeSetActionProvider extends ResourceModelActionProvider {
 		};
 	}
 
-	private boolean isVisible(IDiff diff) {
+	/* package */ boolean isVisible(IDiff diff) {
 		return ((SynchronizePageConfiguration)getSynchronizePageConfiguration()).isVisible(diff);
 	}
 	
@@ -554,4 +555,8 @@ public class ChangeSetActionProvider extends ResourceModelActionProvider {
 		}
 		return false;
 	}
+
+	/* package */ ISynchronizePageConfiguration internalGetSynchronizePageConfiguration() {
+		return getSynchronizePageConfiguration();
+	}
 }
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetComparator.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetComparator.java
new file mode 100644
index 000000000..d60bec9fb
--- /dev/null
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetComparator.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.team.internal.ccvs.ui.mappings;
+
+import java.util.Comparator;
+
+public class ChangeSetComparator implements Comparator {
+	private ChangeSetSorter fSorter= new ChangeSetSorter();
+
+	public int compare(Object o1, Object o2) {
+		return fSorter.compare(null, o1, o2);
+	}
+}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitOperation.java
index 216126ea5..d1504db09 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitOperation.java
@@ -11,8 +11,7 @@
 package org.eclipse.team.internal.ccvs.ui.subscriber;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
 import org.eclipse.compare.structuremergeviewer.IDiffElement;
 import org.eclipse.core.resources.IProject;
@@ -33,6 +32,7 @@ import org.eclipse.team.internal.ccvs.core.client.Command;
 import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
 import org.eclipse.team.internal.ccvs.ui.*;
 import org.eclipse.team.internal.ccvs.ui.Policy;
+import org.eclipse.team.internal.ccvs.ui.mappings.ChangeSetComparator;
 import org.eclipse.team.internal.ccvs.ui.operations.*;
 import org.eclipse.team.internal.ccvs.ui.repo.RepositoryManager;
 import org.eclipse.team.internal.core.subscribers.ChangeSet;
@@ -283,7 +283,8 @@ public class WorkspaceCommitOperation extends CVSSubscriberOperation {
 
     private String getProposedComment(IResource[] resourcesToCommit) {
     	StringBuffer comment = new StringBuffer();
-        ChangeSet[] sets = CVSUIPlugin.getPlugin().getChangeSetManager().getSortedSets();
+        ChangeSet[] sets = CVSUIPlugin.getPlugin().getChangeSetManager().getSets();
+        Arrays.sort(sets, new ChangeSetComparator());
         int numMatchedSets = 0;
         for (int i = 0; i < sets.length; i++) {
             ChangeSet set = sets[i];
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardCommitPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardCommitPage.java
index 9919c64f8..5c68c14bb 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardCommitPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardCommitPage.java
@@ -11,6 +11,8 @@
 
 package org.eclipse.team.internal.ccvs.ui.wizards;
 
+import java.util.Arrays;
+
 import org.eclipse.compare.*;
 import org.eclipse.compare.structuremergeviewer.IDiffElement;
 import org.eclipse.core.resources.IResource;
@@ -34,6 +36,7 @@ import org.eclipse.team.core.synchronize.SyncInfo;
 import org.eclipse.team.core.synchronize.SyncInfoSet;
 import org.eclipse.team.internal.ccvs.ui.*;
 import org.eclipse.team.internal.ccvs.ui.IHelpContextIds;
+import org.eclipse.team.internal.ccvs.ui.mappings.ChangeSetComparator;
 import org.eclipse.team.internal.core.subscribers.ActiveChangeSet;
 import org.eclipse.team.internal.core.subscribers.ChangeSet;
 import org.eclipse.team.internal.ui.*;
@@ -404,6 +407,7 @@ public class CommitWizardCommitPage extends WizardPage implements IPropertyChang
     private String getProposedComment(IResource[] resourcesToCommit) {
     	StringBuffer comment = new StringBuffer();
         ChangeSet[] sets = CVSUIPlugin.getPlugin().getChangeSetManager().getSets();
+        Arrays.sort(sets, new ChangeSetComparator());
         int numMatchedSets = 0;
         for (int i = 0; i < sets.length; i++) {
             ChangeSet set = sets[i];
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ChangeSetActionGroup.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ChangeSetActionGroup.java
index 2874744fd..5c93a28f0 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ChangeSetActionGroup.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ChangeSetActionGroup.java
@@ -11,8 +11,8 @@
 package org.eclipse.team.internal.ui.synchronize.actions;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
+import java.text.Collator;
+import java.util.*;
 
 import org.eclipse.compare.structuremergeviewer.IDiffElement;
 import org.eclipse.core.resources.IResource;
@@ -352,7 +352,13 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup {
     }
     
     protected void addChangeSets(IMenuManager manager) {
-        ChangeSet[] sets = getActiveChangeSetManager().getSortedSets();
+        ChangeSet[] sets = getActiveChangeSetManager().getSets();
+        Arrays.sort(sets, new Comparator() {
+        	private Collator collator = Collator.getInstance();
+        	public int compare(Object o1, Object o2) {
+        		return collator.compare(((ChangeSet) o1).getName(), ((ChangeSet) o2).getName());
+        	}
+        });
         ISelection selection = getContext().getSelection();
         createChangeSet.selectionChanged(selection);
 		addToChangeSet.add(createChangeSet);