[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2117] trunk/org.rubypeople.rdt.refactoring/src/ org/rubypeople/rdt/refactoring

[<mir...@us...>]

Revision: 2117
          http://svn.sourceforge.net/rubyeclipse/?rev=2117&view=rev
Author:   mirkostocker
Date:     2007-03-09 08:27:28 -0800 (Fri, 09 Mar 2007)

Log Message:
-----------
sort the members of the occurences selection page by line

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamelocalvariable/RenameLocalVariableRefactoring.java
    trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/OccurenceReplaceSelectionPage.java

Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamelocalvariable/RenameLocalVariableRefactoring.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamelocalvariable/RenameLocalVariableRefactoring.java	2007-03-09 16:17:30 UTC (rev 2116)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamelocalvariable/RenameLocalVariableRefactoring.java	2007-03-09 16:27:28 UTC (rev 2117)
@@ -41,7 +41,7 @@
 		super(NAME);
 		
 		DocumentProvider docProvider = getDocumentProvider();
-		//docprovider vom checker erstellen lassen und dann einfach neu setzen in der config? cache invalidieren!
+		
 		RenameLocalConfig config = new RenameLocalConfig(docProvider, selectionProvider.getCarretPosition());
 		RenameLocalConditionChecker checker = new RenameLocalConditionChecker(config);
 		setRefactoringConditionChecker(checker);

Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/OccurenceReplaceSelectionPage.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/OccurenceReplaceSelectionPage.java	2007-03-09 16:17:30 UTC (rev 2116)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/OccurenceReplaceSelectionPage.java	2007-03-09 16:27:28 UTC (rev 2117)
@@ -31,6 +31,8 @@
 package org.rubypeople.rdt.refactoring.ui.pages;
 
 import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.TreeSet;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
@@ -114,7 +116,16 @@
 
 	private void initPossibilityTable(Composite control) {
 		possibilityTable = new Table(control, SWT.BORDER | SWT.CHECK);
-		for(INodeWrapper currentCall : selector.getPossibleCalls()){
+		
+		TreeSet<INodeWrapper> possibleCalls = new TreeSet<INodeWrapper>(new Comparator<INodeWrapper>(){
+
+			public int compare(INodeWrapper left, INodeWrapper right) {
+				return left.getWrappedNode().getPosition().getStartOffset() - right.getWrappedNode().getPosition().getStartOffset();
+			}});
+		
+		possibleCalls.addAll(selector.getPossibleCalls());
+		
+		for(INodeWrapper currentCall : possibleCalls){
 			TableItem currentItem = new TableItem(possibilityTable, SWT.NONE);
 			currentItem.setText(getTableCaption(currentCall));
 			if(probableCall(currentCall)){


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.