Merge pull request #848 from noncom/master

make java-resource-paths file find strategy ignore folders
ccw-ide · Aug 31, 2015 · 0e3f7c9 · 0e3f7c9
2 parents 713702e + 4fa3023
commit 0e3f7c9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/ChangeLog.adoc b/ChangeLog.adoc
@@ -18,6 +18,8 @@ Laurent Petit <laurent dot petit at gmail dot com>
 === REPL
 - The REPL View is now visible in all Perspectives, not only the perspective where it was opened. Fix #686
 
+=== Issues
+- The `java-resource-paths` file finding strategy was considering folders as correct results which was wrong. Fix #847
 
 == Counterclockwise 0.34.0
 

diff --git a/ccw.core/src/clj/ccw/eclipse.clj b/ccw.core/src/clj/ccw/eclipse.clj
@@ -489,7 +489,7 @@
                        (-> root-path (.append path))
                        (-> root-path (.append package-path) (.append path)))
                 search (workspace-resource path)]
-          :when search]
+          :when (and search (= IResource/FILE (.getType search)))]
       (.toOSString (.getLocation search)))))
 
 (defn project-relative-path