Attachment 84621 Details for Bug 211977 – Fix

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

[patch] Fix

211977_patch.txt (text/plain), 3.48 KB, created by Markus Keller

on 2007-12-06 05:30:38 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Keller

Created: 2007-12-06 05:30:38 EST

Size: 3.48 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.ide
>Index: extensions/org/eclipse/ui/dialogs/FilteredResourcesSelectionDialog.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/FilteredResourcesSelectionDialog.java,v
>retrieving revision 1.16
>diff -u -r1.16 FilteredResourcesSelectionDialog.java
>--- extensions/org/eclipse/ui/dialogs/FilteredResourcesSelectionDialog.java	21 Mar 2007 15:46:13 -0000	1.16
>+++ extensions/org/eclipse/ui/dialogs/FilteredResourcesSelectionDialog.java	6 Dec 2007 10:28:31 -0000
>@@ -10,6 +10,8 @@
>  *******************************************************************************/
> package org.eclipse.ui.dialogs;
> 
>+import com.ibm.icu.text.Collator;
>+
> import java.io.IOException;
> import java.io.StringReader;
> import java.io.StringWriter;
>@@ -18,17 +20,25 @@
> import java.util.Comparator;
> import java.util.List;
> 
>+import org.eclipse.core.runtime.CoreException;
>+import org.eclipse.core.runtime.IPath;
>+import org.eclipse.core.runtime.IProgressMonitor;
>+import org.eclipse.core.runtime.IStatus;
>+import org.eclipse.core.runtime.ListenerList;
>+import org.eclipse.core.runtime.Status;
>+
> import org.eclipse.core.resources.IContainer;
> import org.eclipse.core.resources.IResource;
> import org.eclipse.core.resources.IResourceProxy;
> import org.eclipse.core.resources.IResourceProxyVisitor;
> import org.eclipse.core.resources.IWorkspace;
> import org.eclipse.core.resources.ResourcesPlugin;
>-import org.eclipse.core.runtime.CoreException;
>-import org.eclipse.core.runtime.IProgressMonitor;
>-import org.eclipse.core.runtime.IStatus;
>-import org.eclipse.core.runtime.ListenerList;
>-import org.eclipse.core.runtime.Status;
>+
>+import org.eclipse.swt.graphics.Image;
>+import org.eclipse.swt.widgets.Composite;
>+import org.eclipse.swt.widgets.Control;
>+import org.eclipse.swt.widgets.Shell;
>+
> import org.eclipse.jface.action.Action;
> import org.eclipse.jface.action.IAction;
> import org.eclipse.jface.action.IMenuManager;
>@@ -44,10 +54,7 @@
> import org.eclipse.jface.viewers.LabelProviderChangedEvent;
> import org.eclipse.jface.viewers.Viewer;
> import org.eclipse.jface.viewers.ViewerFilter;
>-import org.eclipse.swt.graphics.Image;
>-import org.eclipse.swt.widgets.Composite;
>-import org.eclipse.swt.widgets.Control;
>-import org.eclipse.swt.widgets.Shell;
>+
> import org.eclipse.ui.IMemento;
> import org.eclipse.ui.IWorkbenchPage;
> import org.eclipse.ui.IWorkbenchWindow;
>@@ -66,8 +73,6 @@
> import org.eclipse.ui.model.WorkbenchLabelProvider;
> import org.eclipse.ui.statushandlers.StatusManager;
> 
>-import com.ibm.icu.text.Collator;
>-
> /**
>  * Shows a list of resources to the user with a text entry field for a string
>  * pattern used to filter the list of resources.
>@@ -407,9 +412,16 @@
> 				String s2 = resource2.getName();
> 				int comparability = collator.compare(s1, s2);
> 				if (comparability == 0) {
>-					s1 = resource1.getFullPath().toString();
>-					s2 = resource2.getFullPath().toString();
>-					comparability = collator.compare(s1, s2);
>+					IPath p1 = resource1.getFullPath();
>+					IPath p2 = resource2.getFullPath();
>+					int c1 = p1.segmentCount();
>+					int c2 = p2.segmentCount();
>+					for (int i= 0; i < c1 && i < c2; i++) {
>+						comparability = collator.compare(p1.segment(i), p2.segment(i));
>+						if (comparability != 0)
>+							return comparability;
>+					}
>+					comparability = c2 - c1;
> 				}
> 
> 				return comparability;

Actions: View | Diff

Attachments on bug 211977: 84621