Attachment 156418 Details for Bug 299954 – Fix

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

[patch] Fix

299954_patch.txt (text/plain), 2.48 KB, created by Markus Keller

on 2010-01-18 13:10:27 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Keller

Created: 2010-01-18 13:10:27 EST

Size: 2.48 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/dialogs/FilteredItemsSelectionDialog.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FilteredItemsSelectionDialog.java,v
>retrieving revision 1.79
>diff -u -r1.79 FilteredItemsSelectionDialog.java
>--- Eclipse UI/org/eclipse/ui/dialogs/FilteredItemsSelectionDialog.java	24 Nov 2009 19:35:58 -0000	1.79
>+++ Eclipse UI/org/eclipse/ui/dialogs/FilteredItemsSelectionDialog.java	18 Jan 2010 18:10:10 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2010 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
>@@ -3267,50 +3267,10 @@
> 	}
> 
> 	/**
>-	 * Compares items using camel case method.
>-	 */
>-	private class CamelCaseComparator implements Comparator {
>-
>-		/*
>-		 * (non-Javadoc)
>-		 * 
>-		 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
>-		 */
>-		public int compare(Object o1, Object o2) {
>-
>-			int leftCategory = getCamelCaseCategory(o1);
>-			int rightCategory = getCamelCaseCategory(o2);
>-			if (leftCategory < rightCategory)
>-				return -1;
>-			if (leftCategory > rightCategory)
>-				return +1;
>-
>-			return getItemsComparator().compare(o1, o2);
>-		}
>-
>-		private int getCamelCaseCategory(Object item) {
>-			if (filter == null)
>-				return 0;
>-			if (!filter.isCamelCasePattern())
>-				return 0;
>-			return filter.matchesRawNamePattern(item) ? 0 : 1;
>-		}
>-	}
>-
>-	/**
> 	 * Compares items according to the history.
> 	 */
> 	private class HistoryComparator implements Comparator {
> 
>-		private CamelCaseComparator camelCaseComparator;
>-
>-		/**
>-		 * 
>-		 */
>-		public HistoryComparator() {
>-			this.camelCaseComparator = new CamelCaseComparator();
>-		}
>-
> 		/*
> 		 * (non-Javadoc)
> 		 * 
>@@ -3319,7 +3279,7 @@
> 		public int compare(Object o1, Object o2) {
> 			if ((isHistoryElement(o1) && isHistoryElement(o2))
> 					|| (!isHistoryElement(o1) && !isHistoryElement(o2)))
>-				return this.camelCaseComparator.compare(o1, o2);
>+				return getItemsComparator().compare(o1, o2);
> 
> 			if (isHistoryElement(o1))
> 				return -2;

Actions: View | Diff

Attachments on bug 299954: 156418