Merge remote-tracking branch 'GitHub/master'

.gitignore

@@ -27,3 +27,7 @@ target/
 # Gradle
 .gradle/
 build/
+
+# WinMerge
+*.bak
+

app/src/main/groovy/jd/gui/controller/SaveAllSourcesController.groovy

@@ -36,8 +36,8 @@ class SaveAllSourcesController implements SourcesSavable.Controller, SourcesSava
         // Show
         this.saveAllSourcesView.show(file)
         // Execute background task
-        executor.submit(new Callable<Void>() {
-            Void call() throws Exception {
+        executor.execute(new Runnable() {
+            void run() {
                 int fileCount = savable.fileCount
                 int quotient = (fileCount / 100)
 
@@ -56,10 +56,15 @@ class SaveAllSourcesController implements SourcesSavable.Controller, SourcesSava
                 def path = Paths.get(file.toURI())
                 Files.deleteIfExists(path)
 
-                savable.save(api, this as SourcesSavable.Controller, this as SourcesSavable.Listener, path)
+                try {
+                    savable.save(api, this as SourcesSavable.Controller, this as SourcesSavable.Listener, path)
+                } catch (Exception e) {
+                    saveAllSourcesView.showActionFailedDialog()
+                    cancel = true
+                }
 
                 if (cancel) {
-                    Files.delete(path)
+                    Files.deleteIfExists(path)
                 }
 
                 saveAllSourcesView.hide()

app/src/main/groovy/jd/gui/view/SaveAllSourcesView.groovy

@@ -9,6 +9,8 @@ import groovy.swing.SwingBuilder
 import jd.gui.api.API
 import jd.gui.model.configuration.Configuration
 
+import javax.swing.JDialog
+import javax.swing.JOptionPane
 import java.awt.event.WindowAdapter
 import java.awt.event.WindowEvent
 
@@ -73,4 +75,9 @@ class SaveAllSourcesView {
             saveAllSourcesDialog.visible = false
         }
     }
+
+    void showActionFailedDialog() {
+        JOptionPane.showMessageDialog(
+            swing.saveAllSourcesDialog, '"Save All Sources" action failed.', 'Error', JOptionPane.ERROR_MESSAGE)
+    }
 }

services/src/main/groovy/jd/gui/model/container/GenericContainer.groovy

@@ -94,7 +94,23 @@ class GenericContainer implements Container {
         }
 
         protected Collection<Container.Entry> loadChildrenFromDirectoryEntry() {
-            return Files.newDirectoryStream(fsPath).collect { Path subPath -> new Entry(this, subPath, null) }.sort()
+            DirectoryStream<Path> stream = null
+
+            try {
+                def children = new ArrayList<Container.Entry>()
+                int parentNameCount = fsPath.nameCount
+                stream = Files.newDirectoryStream(fsPath)
+
+                for (def subPath : stream) {
+                    if (subPath.nameCount > parentNameCount) {
+                        children.add(new Entry(this, subPath, null))
+                    }
+                }
+
+                return children.sort()
+            } finally {
+                stream?.close()
+            }
         }
 
         protected Collection<Container.Entry> loadChildrenFromFileEntry() {

services/src/main/groovy/jd/gui/service/fileloader/ClassFileLoaderProvider.groovy

@@ -29,12 +29,12 @@ class ClassFileLoaderProvider extends AbstractFileLoaderProvider {
             def path = file.path
 
             while (! path.endsWith(pathSuffix)) {
-                int index = pathSuffix.indexOf(File.separatorChar)
+                int index = pathSuffix.indexOf(File.separator)
 
                 if (index == -1) {
                     pathSuffix = ''
                 } else {
-                    pathSuffix = pathSuffix.substring(index)
+                    pathSuffix = pathSuffix.substring(index+1)
                 }
             }
 

services/src/main/groovy/jd/gui/service/sourcesaver/FileSourceSaverProvider.groovy

@@ -12,6 +12,7 @@ import jd.gui.spi.SourceSaver
 
 import java.nio.file.Files
 import java.nio.file.Path
+import java.nio.file.StandardCopyOption
 import java.util.regex.Pattern
 
 class FileSourceSaverProvider implements SourceSaver {
@@ -28,7 +29,7 @@ class FileSourceSaverProvider implements SourceSaver {
         listener.pathSaved(path)
 
         entry.inputStream.withStream { InputStream is ->
-            Files.copy(is, path)
+            Files.copy(is, path, StandardCopyOption.REPLACE_EXISTING)
         }
     }
 }