Fixes bug on Select Location popup

Ive4 · May 29, 2015 · 97c9107 · 97c9107
1 parent 7e50f15
commit 97c9107
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/app/src/main/groovy/jd/gui/controller/SelectLocationController.groovy b/app/src/main/groovy/jd/gui/controller/SelectLocationController.groovy
@@ -60,7 +60,7 @@ class SelectLocationController {
                 Container.Entry getParent() { null }
                 URI getUri() { parentEntry.uri }
                 String getPath() { parentEntry.path }
-                boolean isDirectory() { false }
+                boolean isDirectory() { parentEntry.isDirectory() }
                 long length() { 0 }
                 InputStream getInputStream() { null }
                 Collection<Container.Entry> getChildren() { children }

diff --git a/services/src/main/groovy/jd/gui/service/fileloader/AbstractFileLoaderProvider.groovy b/services/src/main/groovy/jd/gui/service/fileloader/AbstractFileLoaderProvider.groovy
@@ -22,13 +22,18 @@ abstract class AbstractFileLoaderProvider implements FileLoader {
         }
         // Dummy parent entry
         def uri = file.toURI()
+        def path = uri.path
+
+        if (path.endsWith('/'))
+            path = path.substring(0, path.length()-1)
+
         def parentEntry = new Container.Entry() {
             Collection<Container.Entry> children = Collections.emptyList()
 
             Container getContainer() { parentContainer }
             Container.Entry getParent() { null }
             URI getUri() { uri }
-            String getPath() { uri.path }
+            String getPath() { path }
             boolean isDirectory() { file.isDirectory() }
             long length() { 0 }
             InputStream getInputStream() { null }