Fixed overoptimistic isPackage when the classpath contains a folder.

quarnster · quarnster · commit d6959c590fbc · 2012-12-03T19:18:22.000+01:00
Related to issue #53.
diff --git a/SublimeJava.java b/SublimeJava.java
@@ -243,12 +243,12 @@ private static boolean isPackage(String packageName)
         if (p != null)
             return true;
 
-        packageName = packageName.replace(".", "/");
+        packageName = packageName.replace(".", File.pathSeparator);
 
         ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
         for (String s : getClasspathEntries())
         {
-            URL url = classLoader.getResource(s + "/" + packageName);
+            URL url = classLoader.getResource(s + File.pathSeparator + packageName);
             if (url != null)
                 return true;
             else
@@ -275,8 +275,9 @@ private static boolean isPackage(String packageName)
             }
             else
             {
-                File folder = new File(filename);
-                return folder.exists();
+                File folder = new File(filename + File.pathSeparator + packageName);
+                if (folder.exists())
+                    return true;
             }
         }
         return false;

Original file line number	Diff line number	Diff line change
`@@ -243,12 +243,12 @@ private static boolean isPackage(String packageName)`
`243`	`243`	`if (p != null)`
`244`	`244`	`return true;`
`245`	`245`
`246`		`- packageName = packageName.replace(".", "/");`
	`246`	`+ packageName = packageName.replace(".", File.pathSeparator);`
`247`	`247`
`248`	`248`	`ClassLoader classLoader = Thread.currentThread().getContextClassLoader();`
`249`	`249`	`for (String s : getClasspathEntries())`
`250`	`250`	`{`
`251`		`- URL url = classLoader.getResource(s + "/" + packageName);`
	`251`	`+ URL url = classLoader.getResource(s + File.pathSeparator + packageName);`
`252`	`252`	`if (url != null)`
`253`	`253`	`return true;`
`254`	`254`	`else`
`@@ -275,8 +275,9 @@ private static boolean isPackage(String packageName)`
`275`	`275`	`}`
`276`	`276`	`else`
`277`	`277`	`{`
`278`		`- File folder = new File(filename);`
`279`		`- return folder.exists();`
	`278`	`+ File folder = new File(filename + File.pathSeparator + packageName);`
	`279`	`+ if (folder.exists())`
	`280`	`+ return true;`
`280`	`281`	`}`
`281`	`282`	`}`
`282`	`283`	`return false;`