Index: GotoResourceDialog.java
===================================================================
RCS file: /home/eclipse/org.eclipse.ui/Eclipse UI Standard Components/org/eclipse/ui/views/navigator/GotoResourceDialog.java,v
retrieving revision 1.10
diff -u -r1.10 GotoResourceDialog.java
--- GotoResourceDialog.java	1 Mar 2002 22:09:45 -0000	1.10
+++ GotoResourceDialog.java	13 Sep 2002 14:39:57 -0000
@@ -54,11 +54,6 @@
 			Display display = resourceNames.getDisplay();
 			final int itemIndex[] = {0};
 			final int itemCount[] = {0};
-			display.syncExec(new Runnable(){
-				public void run() {
-			 		itemCount[0] = resourceNames.getItemCount();
-				}
-			});
 			int last = lastMatch;
 			boolean setFirstMatch = true;
 			for (int i = firstMatch; i <= lastMatch;i++) {
@@ -76,6 +71,7 @@
 					display.syncExec(new Runnable() {
 						public void run() {
 							if(stop || resourceNames.isDisposed()) return;
+							itemCount[0] = resourceNames.getItemCount();
 							updateItem(index,itemIndex[0],itemCount[0]);
 							itemIndex[0]++;
 						}
@@ -90,6 +86,10 @@
 			 			resourceNames.setRedraw(false);
 				 		resourceNames.remove(itemIndex[0],itemCount[0] -1);
 			 			resourceNames.setRedraw(true);
+			 		}
+			 		// If no resources, remove remaining folder entries
+			 		if(resourceNames.getItemCount() == 0) {
+			 			folderNames.removeAll();
 			 		}
 				}
 			});