Optimize imports

emmanue1 · emmanue1 · commit 9f7aeb7780e0 · 2019-04-14T22:40:35.000+02:00
diff --git a/api/src/main/java/org/jd/gui/api/feature/SourcesSavable.java b/api/src/main/java/org/jd/gui/api/feature/SourcesSavable.java
@@ -8,6 +8,7 @@
 package org.jd.gui.api.feature;
 
 import org.jd.gui.api.API;
+
 import java.nio.file.Path;
 
 public interface SourcesSavable {
diff --git a/api/src/main/java/org/jd/gui/spi/PanelFactory.java b/api/src/main/java/org/jd/gui/spi/PanelFactory.java
@@ -11,7 +11,7 @@
 import org.jd.gui.api.feature.UriGettable;
 import org.jd.gui.api.model.Container;
 
-import javax.swing.JComponent;
+import javax.swing.*;
 
 public interface PanelFactory {
 	String[] getTypes();
diff --git a/api/src/main/java/org/jd/gui/spi/TreeNodeFactory.java b/api/src/main/java/org/jd/gui/spi/TreeNodeFactory.java
@@ -7,13 +7,12 @@
 
 package org.jd.gui.spi;
 
-import javax.swing.tree.DefaultMutableTreeNode;
-
 import org.jd.gui.api.API;
 import org.jd.gui.api.feature.ContainerEntryGettable;
 import org.jd.gui.api.feature.UriGettable;
 import org.jd.gui.api.model.Container;
 
+import javax.swing.tree.DefaultMutableTreeNode;
 import java.util.regex.Pattern;
 
 public interface TreeNodeFactory {
diff --git a/app/src/main/java/org/jd/gui/OsxApp.java b/app/src/main/java/org/jd/gui/OsxApp.java
@@ -7,7 +7,7 @@
 
 package org.jd.gui;
 
-import com.apple.eawt.*;
+import com.apple.eawt.Application;
 
 public class OsxApp extends App {
 
diff --git a/app/src/main/java/org/jd/gui/controller/MainController.java b/app/src/main/java/org/jd/gui/controller/MainController.java
@@ -39,12 +39,18 @@
 import java.awt.datatransfer.Transferable;
 import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
-import java.io.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
 import java.net.URI;
 import java.nio.file.Path;
 import java.util.*;
 import java.util.List;
-import java.util.concurrent.*;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 public class MainController implements API {
     protected Configuration configuration;
diff --git a/app/src/main/java/org/jd/gui/controller/OpenTypeController.java b/app/src/main/java/org/jd/gui/controller/OpenTypeController.java
@@ -11,7 +11,6 @@
 import org.jd.gui.api.feature.IndexesChangeListener;
 import org.jd.gui.api.model.Container;
 import org.jd.gui.api.model.Indexes;
-import org.jd.gui.util.exception.ExceptionUtil;
 import org.jd.gui.util.net.UriUtil;
 import org.jd.gui.view.OpenTypeView;
 
diff --git a/app/src/main/java/org/jd/gui/controller/SaveAllSourcesController.java b/app/src/main/java/org/jd/gui/controller/SaveAllSourcesController.java
@@ -14,7 +14,6 @@
 
 import javax.swing.*;
 import java.io.File;
-import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
diff --git a/app/src/main/java/org/jd/gui/controller/SearchInConstantPoolsController.java b/app/src/main/java/org/jd/gui/controller/SearchInConstantPoolsController.java
@@ -20,7 +20,6 @@
 import org.jd.gui.view.SearchInConstantPoolsView;
 
 import javax.swing.*;
-import java.awt.*;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.*;
diff --git a/app/src/main/java/org/jd/gui/util/swing/SwingUtil.java b/app/src/main/java/org/jd/gui/util/swing/SwingUtil.java
@@ -8,7 +8,6 @@
 package org.jd.gui.util.swing;
 
 import org.jd.gui.util.exception.ExceptionUtil;
-import org.jd.gui.view.MainView;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/app/src/main/java/org/jd/gui/view/MainView.java b/app/src/main/java/org/jd/gui/view/MainView.java
@@ -24,8 +24,11 @@
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
 import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
+import java.awt.event.ActionListener;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.io.File;
 import java.net.URI;
 import java.util.Arrays;
 import java.util.List;
diff --git a/app/src/main/java/org/jd/gui/view/OpenTypeView.java b/app/src/main/java/org/jd/gui/view/OpenTypeView.java
@@ -22,7 +22,10 @@
 import javax.swing.text.BadLocationException;
 import java.awt.*;
 import java.awt.event.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Map;
 import java.util.function.Consumer;
 
 public class OpenTypeView {
diff --git a/app/src/main/java/org/jd/gui/view/SelectLocationView.java b/app/src/main/java/org/jd/gui/view/SelectLocationView.java
@@ -25,7 +25,10 @@
 import java.awt.*;
 import java.awt.event.*;
 import java.net.URI;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Set;
 import java.util.function.Consumer;
 
 public class SelectLocationView<T extends DefaultMutableTreeNode & ContainerEntryGettable & UriGettable> {
diff --git a/app/src/main/java/org/jd/gui/view/component/panel/MainTabbedPanel.java b/app/src/main/java/org/jd/gui/view/component/panel/MainTabbedPanel.java
@@ -12,8 +12,6 @@
 import org.jd.gui.service.platform.PlatformService;
 
 import javax.swing.*;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 import java.awt.*;
 import java.net.URI;
 import java.util.ArrayList;
diff --git a/app/src/main/java/org/jd/gui/view/component/panel/TreeTabbedPanel.java b/app/src/main/java/org/jd/gui/view/component/panel/TreeTabbedPanel.java
@@ -15,14 +15,21 @@
 import org.jd.gui.view.renderer.TreeNodeRenderer;
 
 import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.tree.*;
+import javax.swing.event.TreeExpansionEvent;
+import javax.swing.event.TreeExpansionListener;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreeNode;
+import javax.swing.tree.TreePath;
 import java.awt.*;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.Map;
 
 public class TreeTabbedPanel<T extends DefaultMutableTreeNode & ContainerEntryGettable & UriGettable> extends JPanel implements UriGettable, UriOpenable, PageChangeable, PageClosable, PreferencesChangeListener {
     protected API api;
diff --git a/services/src/main/java/org/jd/gui/service/actions/CopyQualifiedNameContextualActionsFactory.java b/services/src/main/java/org/jd/gui/service/actions/CopyQualifiedNameContextualActionsFactory.java
@@ -14,10 +14,9 @@
 import org.jd.gui.spi.TypeFactory;
 
 import javax.swing.*;
-import java.awt.Toolkit;
+import java.awt.*;
 import java.awt.datatransfer.StringSelection;
 import java.awt.event.ActionEvent;
-import java.io.File;
 import java.util.Collection;
 import java.util.Collections;
 
diff --git a/services/src/main/java/org/jd/gui/service/fileloader/ClassFileLoaderProvider.java b/services/src/main/java/org/jd/gui/service/fileloader/ClassFileLoaderProvider.java
@@ -11,7 +11,10 @@
 import org.jd.gui.util.exception.ExceptionUtil;
 import org.objectweb.asm.ClassReader;
 
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
 
 public class ClassFileLoaderProvider extends AbstractTypeFileLoaderProvider {
     protected static final String[] EXTENSIONS = { "class" };
diff --git a/services/src/main/java/org/jd/gui/service/indexer/ClassFileIndexerProvider.java b/services/src/main/java/org/jd/gui/service/indexer/ClassFileIndexerProvider.java
@@ -16,7 +16,9 @@
 import org.objectweb.asm.signature.SignatureVisitor;
 
 import java.io.InputStream;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Map;
 
 /**
  * Unsafe thread implementation of class file indexer.
diff --git a/services/src/main/java/org/jd/gui/service/indexer/DirectoryIndexerProvider.java b/services/src/main/java/org/jd/gui/service/indexer/DirectoryIndexerProvider.java
@@ -11,7 +11,6 @@
 import org.jd.gui.api.model.Container;
 import org.jd.gui.api.model.Indexes;
 import org.jd.gui.spi.Indexer;
-import org.jd.gui.util.exception.ExceptionUtil;
 
 public class DirectoryIndexerProvider extends AbstractIndexerProvider {
 
diff --git a/services/src/main/java/org/jd/gui/service/indexer/JavaFileIndexerProvider.java b/services/src/main/java/org/jd/gui/service/indexer/JavaFileIndexerProvider.java
@@ -7,16 +7,16 @@
 
 package org.jd.gui.service.indexer;
 
+import org.antlr.v4.runtime.ANTLRInputStream;
+import org.antlr.v4.runtime.ParserRuleContext;
+import org.antlr.v4.runtime.tree.ParseTree;
+import org.antlr.v4.runtime.tree.TerminalNode;
 import org.jd.gui.api.API;
 import org.jd.gui.api.model.Container;
 import org.jd.gui.api.model.Indexes;
 import org.jd.gui.util.exception.ExceptionUtil;
 import org.jd.gui.util.parser.antlr.ANTLRJavaParser;
 import org.jd.gui.util.parser.antlr.AbstractJavaListener;
-import org.antlr.v4.runtime.ANTLRInputStream;
-import org.antlr.v4.runtime.ParserRuleContext;
-import org.antlr.v4.runtime.tree.ParseTree;
-import org.antlr.v4.runtime.tree.TerminalNode;
 import org.jd.gui.util.parser.antlr.JavaParser;
 
 import java.io.IOException;
diff --git a/services/src/main/java/org/jd/gui/service/sourcesaver/ClassFileSourceSaverProvider.java b/services/src/main/java/org/jd/gui/service/sourcesaver/ClassFileSourceSaverProvider.java
@@ -10,8 +10,8 @@
 import org.jd.core.v1.ClassFileToJavaSourceDecompiler;
 import org.jd.gui.api.API;
 import org.jd.gui.api.model.Container;
-import org.jd.gui.util.decompiler.LineNumberStringBuilderPrinter;
 import org.jd.gui.util.decompiler.ContainerLoader;
+import org.jd.gui.util.decompiler.LineNumberStringBuilderPrinter;
 import org.jd.gui.util.exception.ExceptionUtil;
 import org.jd.gui.util.io.NewlineOutputStream;
 
diff --git a/services/src/main/java/org/jd/gui/service/treenode/AbstractTypeFileTreeNodeFactoryProvider.java b/services/src/main/java/org/jd/gui/service/treenode/AbstractTypeFileTreeNodeFactoryProvider.java
@@ -24,7 +24,6 @@
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
 
 public abstract class AbstractTypeFileTreeNodeFactoryProvider extends AbstractTreeNodeFactoryProvider {
diff --git a/services/src/main/java/org/jd/gui/service/type/ClassFileTypeFactoryProvider.java b/services/src/main/java/org/jd/gui/service/type/ClassFileTypeFactoryProvider.java
@@ -17,7 +17,10 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 
 public class ClassFileTypeFactoryProvider extends AbstractTypeFactoryProvider {
 
diff --git a/services/src/main/java/org/jd/gui/service/type/JavaFileTypeFactoryProvider.java b/services/src/main/java/org/jd/gui/service/type/JavaFileTypeFactoryProvider.java
@@ -7,15 +7,17 @@
 
 package org.jd.gui.service.type;
 
-import org.jd.gui.api.API;
-import org.jd.gui.api.model.Container;
-import org.jd.gui.api.model.Type;
-import org.jd.gui.util.exception.ExceptionUtil;
-import org.jd.gui.util.parser.antlr.*;
 import org.antlr.v4.runtime.ANTLRInputStream;
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.TerminalNode;
+import org.jd.gui.api.API;
+import org.jd.gui.api.model.Container;
+import org.jd.gui.api.model.Type;
+import org.jd.gui.util.exception.ExceptionUtil;
+import org.jd.gui.util.parser.antlr.ANTLRJavaParser;
+import org.jd.gui.util.parser.antlr.AbstractJavaListener;
+import org.jd.gui.util.parser.antlr.JavaParser;
 
 import javax.swing.*;
 import java.io.IOException;
diff --git a/services/src/main/java/org/jd/gui/util/container/JarContainerEntryUtil.java b/services/src/main/java/org/jd/gui/util/container/JarContainerEntryUtil.java
@@ -15,7 +15,10 @@
 import org.objectweb.asm.Opcodes;
 
 import java.io.InputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
 
 public class JarContainerEntryUtil {
     public static Collection<Container.Entry> removeInnerTypeEntries(Collection<Container.Entry> entries) {
diff --git a/services/src/main/java/org/jd/gui/util/decompiler/ClassPathLoader.java b/services/src/main/java/org/jd/gui/util/decompiler/ClassPathLoader.java
@@ -9,7 +9,6 @@
 
 import org.jd.core.v1.api.loader.Loader;
 import org.jd.core.v1.api.loader.LoaderException;
-import org.jd.gui.api.model.Container;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/services/src/main/java/org/jd/gui/util/index/IndexUtil.java b/services/src/main/java/org/jd/gui/util/index/IndexUtil.java
@@ -10,7 +10,10 @@
 import org.jd.gui.api.model.Container;
 import org.jd.gui.api.model.Indexes;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
 public class IndexUtil {
     public static boolean containsInternalTypeName(Collection<Indexes> collectionOfIndexes, String internalTypeName) {
diff --git a/services/src/main/java/org/jd/gui/util/parser/antlr/AbstractJavaListener.java b/services/src/main/java/org/jd/gui/util/parser/antlr/AbstractJavaListener.java
@@ -7,10 +7,10 @@
 
 package org.jd.gui.util.parser.antlr;
 
-import org.jd.gui.api.model.Container;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.TerminalNode;
 import org.antlr.v4.runtime.tree.TerminalNodeImpl;
+import org.jd.gui.api.model.Container;
 import org.jd.gui.util.exception.ExceptionUtil;
 
 import java.util.HashMap;
diff --git a/services/src/main/java/org/jd/gui/util/xml/AbstractXmlPathFinder.java b/services/src/main/java/org/jd/gui/util/xml/AbstractXmlPathFinder.java
@@ -13,7 +13,9 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import java.io.StringReader;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
 
 public abstract class AbstractXmlPathFinder {
     protected HashMap<String, HashSet<String>> tagNameToPaths = new HashMap<>();
diff --git a/services/src/main/java/org/jd/gui/view/component/AbstractTextPage.java b/services/src/main/java/org/jd/gui/view/component/AbstractTextPage.java
@@ -19,7 +19,10 @@
 import javax.swing.*;
 import javax.swing.text.BadLocationException;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseWheelListener;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
diff --git a/services/src/main/java/org/jd/gui/view/component/ClassFilePage.java b/services/src/main/java/org/jd/gui/view/component/ClassFilePage.java
@@ -13,9 +13,9 @@
 import org.jd.gui.api.API;
 import org.jd.gui.api.model.Container;
 import org.jd.gui.util.decompiler.ClassPathLoader;
+import org.jd.gui.util.decompiler.ContainerLoader;
 import org.jd.gui.util.decompiler.NopPrinter;
 import org.jd.gui.util.decompiler.StringBuilderPrinter;
-import org.jd.gui.util.decompiler.ContainerLoader;
 import org.jd.gui.util.exception.ExceptionUtil;
 
 import javax.swing.text.BadLocationException;
diff --git a/services/src/main/java/org/jd/gui/view/component/TextPage.java b/services/src/main/java/org/jd/gui/view/component/TextPage.java
@@ -15,7 +15,9 @@
 import org.jd.gui.util.io.NewlineOutputStream;
 
 import java.awt.datatransfer.StringSelection;
-import java.io.*;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
 
 public class TextPage extends AbstractTextPage implements ContentCopyable, ContentSelectable, ContentSavable {
 
