Attachment 69305 Details for Bug 189106 – Patch 003

[patch] Patch 003

patch_189106_20070530.txt (text/plain), 2.11 KB, created by Krzysztof Michalski

on 2007-05-30 11:15:23 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof Michalski

Created: 2007-05-30 11:15:23 EDT

Size: 2.11 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.50
>diff -u -r1.50 FilteredItemsSelectionDialog.java
>--- Eclipse UI/org/eclipse/ui/dialogs/FilteredItemsSelectionDialog.java	24 May 2007 18:08:35 -0000	1.50
>+++ Eclipse UI/org/eclipse/ui/dialogs/FilteredItemsSelectionDialog.java	30 May 2007 15:11:29 -0000
>@@ -1911,7 +1911,8 @@
> 
> 			contentProvider.addHistoryItems(itemsFilter);
> 
>-			contentProvider.refresh();
>+			if (contentProvider.hasItems())
>+				contentProvider.refresh();
> 
> 			filterJob.schedule();
> 
>@@ -2511,6 +2512,14 @@
> 			this.lastSortedItems = Collections.synchronizedList(new ArrayList(
> 					2048));
> 		}
>+		
>+		/**
>+		 * Return whether or not there are any items.
>+		 * @return
>+		 */
>+		public boolean hasItems() {
>+			return !items.isEmpty();
>+		}
> 
> 		/**
> 		 * Sets selection history.
>@@ -2701,12 +2710,12 @@
> 		}
> 
> 		/**
>-		 * Gets filtered items.
>+		 * Gets sorted items.
> 		 * 
>-		 * @return filtered items
>+		 * @return sorted items
> 		 */
>-		private Object[] getItems(boolean sort) {
>-			if (sort || lastSortedItems.size() != items.size()) {
>+		private Object[] getSortedItems() {
>+			if (lastSortedItems.size() != items.size()) {
> 				synchronized (lastSortedItems) {
> 					lastSortedItems.clear();
> 					lastSortedItems.addAll(items);
>@@ -2723,7 +2732,7 @@
> 		 */
> 		public void rememberResult(ItemsFilter itemsFilter) {
> 			List itemsList = Collections.synchronizedList(Arrays
>-					.asList(getItems(false)));
>+					.asList(getSortedItems()));
> 			// synchronization
> 			if (itemsFilter == filter) {
> 				lastCompletedFilter = itemsFilter;
>@@ -2882,7 +2891,7 @@
> 			}
> 
> 			// get already sorted array
>-			Object[] filteredElements = getItems(false);
>+			Object[] filteredElements = getSortedItems();
> 
> 			if (monitor != null) {
> 				monitor.worked(ticks);

Actions: View | Diff

Attachments on bug 189106: 69253 | 69280 | 69305 | 69340