Optimize imports & cleanup

Author: emmanue1

app/src/main/java/org/jd/gui/controller/OpenTypeHierarchyController.java

@@ -18,7 +18,6 @@
 import java.awt.*;
 import java.net.URI;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.function.Consumer;

app/src/main/java/org/jd/gui/service/configuration/ConfigurationXmlPersisterProvider.java

@@ -15,7 +15,9 @@
 import javax.swing.*;
 import javax.xml.stream.*;
 import java.awt.*;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -178,7 +180,7 @@ public void save(Configuration configuration) {
         try (FileOutputStream fos = new FileOutputStream(FILE)) {
             XMLStreamWriter writer = XMLOutputFactory.newInstance().createXMLStreamWriter(fos);
 
-            // Load values
+            // Save values
             writer.writeStartDocument();
             writer.writeCharacters("\n");
             writer.writeStartElement("configuration");

services/src/main/java/org/jd/gui/model/container/GenericContainer.java

@@ -162,8 +162,8 @@ protected Collection<Container.Entry> loadChildrenFromFileEntry() throws IOExcep
             Path tmpPath = Paths.get(tmpFile.toURI());
 
             tmpFile.delete();
-            Files.copy(fsPath, tmpPath);
             tmpFile.deleteOnExit();
+            Files.copy(fsPath, tmpPath);
 
             FileSystem subFileSystem = FileSystems.newFileSystem(tmpPath, null);
 

services/src/main/java/org/jd/gui/view/component/ClassFilePage.java

@@ -21,7 +21,6 @@
 import javax.swing.text.BadLocationException;
 import javax.swing.text.DefaultCaret;
 import java.awt.*;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;