### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.core
Index: search/org/eclipse/jdt/internal/core/search/JavaSearchScope.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/JavaSearchScope.java,v
retrieving revision 1.57
diff -u -r1.57 JavaSearchScope.java
--- search/org/eclipse/jdt/internal/core/search/JavaSearchScope.java	13 Apr 2007 16:02:15 -0000	1.57
+++ search/org/eclipse/jdt/internal/core/search/JavaSearchScope.java	11 Jul 2007 10:46:07 -0000
@@ -600,7 +600,7 @@
 	JavaSearchScope newScope = new JavaSearchScope(this.pathsCount * 2);		// double the number of expected elements
 	newScope.projectPaths.ensureCapacity(this.projectPaths.size());
 	String currentPath;
-	for (int i = this.relativePaths.length; --i >= 0;)
+	for (int i=0, length=this.relativePaths.length; i<length; i++)
 		if ((currentPath = this.relativePaths[i]) != null) {
 			int idx = this.projectIndexes[i];
 			String projectPath = idx == -1 ? null : (String)this.projectPaths.get(idx);
#P org.eclipse.jdt.core.tests.model
Index: src/org/eclipse/jdt/core/tests/model/SearchTests.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/SearchTests.java,v
retrieving revision 1.39
diff -u -r1.39 SearchTests.java
--- src/org/eclipse/jdt/core/tests/model/SearchTests.java	17 Dec 2006 17:18:44 -0000	1.39
+++ src/org/eclipse/jdt/core/tests/model/SearchTests.java	11 Jul 2007 10:46:10 -0000
@@ -21,6 +21,7 @@
 import org.eclipse.jdt.core.*;
 import org.eclipse.jdt.core.compiler.CharOperation;
 import org.eclipse.jdt.core.search.*;
+import org.eclipse.jdt.core.tests.model.AbstractJavaSearchTests.TypeNameMatchCollector;
 import org.eclipse.jdt.core.tests.model.Semaphore.TimeOutException;
 import org.eclipse.jdt.core.tests.util.Util;
 import org.eclipse.jdt.internal.core.JavaElement;
@@ -1030,4 +1031,79 @@
 	assertValidMatchRule("hashMap", SearchPattern.R_CAMELCASE_MATCH);
 	assertValidMatchRule("Hashmap", SearchPattern.R_CAMELCASE_MATCH);
 }
+
+/**
+ * @bug 195228: [search] Invalid path in open type dialog
+ * @test Verify that correct types are found even with project and source folders in the classpath
+ * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=195228"
+ */
+public void testONLY_Bug195228() throws CoreException {
+	try {
+		// Create projects and files
+		final IJavaProject project = createJavaProject("P1", new String[] {"src"}, "bin");
+		createFolder("/P1/src/pack1/pack2");
+		createFile(
+			"/P1/src/pack1/pack2/X.java",
+			"package pack1.pack2;\n" +
+			"public class X {}"
+		);
+		createFile(
+			"/P1/src/pack1/Y.java",
+			"package pack1;\n" +
+			"public class Y {}"
+		);
+		createFile(
+			"/P1/test.properties",
+			"bug=195228"
+		);
+		// Create additional projects to force the rehash of the workspace scope while creating it
+		createJavaProject("P2", new String[] {"src"}, "bin");
+		createJavaProject("P3", new String[] {"src"}, "bin");
+		IJavaSearchScope scope = SearchEngine.createWorkspaceScope();
+		
+		// Store all types found in project
+		TypeNameMatchCollector requestor = new TypeNameMatchCollector();
+		new SearchEngine().searchAllTypeNames(
+			null,
+			SearchPattern.R_EXACT_MATCH,
+			null,
+			SearchPattern.R_PREFIX_MATCH,
+			IJavaSearchConstants.TYPE,
+			scope,
+			requestor,
+			IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH,
+			null);
+		String allTypes = requestor.toString();
+		
+		// Add project folder to classpath with inclusion and exclusion patterns
+		getWorkspace().run(new IWorkspaceRunnable() {
+			public void run(IProgressMonitor monitor) throws CoreException {
+				IClasspathEntry[] entries = project.getRawClasspath();
+				int length = entries.length;
+				System.arraycopy(entries, 0, entries = new IClasspathEntry[length+1], 0, length);
+				entries[length] = JavaCore.newSourceEntry(new Path("/P1"), new IPath[] { new Path("test.properties") }, new IPath[] { new Path("src/") }, null);
+				project.setRawClasspath(entries, null);
+			}
+		}, null);
+		
+		// Search for all types and verify that same are found
+		requestor = new TypeNameMatchCollector();
+		new SearchEngine().searchAllTypeNames(
+			null,
+			SearchPattern.R_EXACT_MATCH,
+			null,
+			SearchPattern.R_PREFIX_MATCH,
+			IJavaSearchConstants.TYPE,
+			scope,
+			requestor,
+			IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH,
+			null);
+		assertEquals("Should found same types!", allTypes, requestor.toString());
+	} finally {
+		deleteProject("P1");
+		deleteProject("P2");
+		deleteProject("P3");
+	}
+}
+
 }