Clean up import declarations project-wide.

jplag.frontend-utils/src/main/java/jplag/Language.java

@@ -1,6 +1,6 @@
 package jplag;
 
-import java.io.*;
+import java.io.File;
 
 /**
  * Common interface for all languages. Each language-front end must provide a concrete language implementation.

jplag.frontend-utils/src/main/java/jplag/NewlineStream.java

@@ -1,7 +1,8 @@
 package jplag;
 
 
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
 
 /* This stream adds a newline to the end of a file.
  * this is a proxy

jplag.frontend.chars/src/main/java/jplag/chars/Parser.java

@@ -1,6 +1,8 @@
 package jplag.chars;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileReader;
+
 import jplag.Structure;
 
 public class Parser extends jplag.Parser implements jplag.TokenConstants {

jplag.frontend.java-1.1exp/src/main/java/jplag/javax/Parser.java

@@ -1,6 +1,6 @@
 package jplag.javax;
 
-import java.io.*;
+import java.io.File;
 
 public class Parser extends jplag.Parser implements JavaTokenConstants {
 	private String actFile;

jplag.frontend.java-1.7/src/main/java/jplag/java17/JplagJava7Listener.java

@@ -1,151 +1,13 @@
 package jplag.java17;
 
-import jplag.java17.grammar.*;
-import jplag.java17.grammar.Java7Parser.AnnotationContext;
-import jplag.java17.grammar.Java7Parser.AnnotationMethodContext;
-import jplag.java17.grammar.Java7Parser.AnnotationNameContext;
-import jplag.java17.grammar.Java7Parser.AnnotationTypeDeclarationContext;
-import jplag.java17.grammar.Java7Parser.AnnotationTypeElementContext;
-import jplag.java17.grammar.Java7Parser.ArgumentsContext;
-import jplag.java17.grammar.Java7Parser.ArrayCreatorRestContext;
-import jplag.java17.grammar.Java7Parser.ArrayInitializerContext;
-import jplag.java17.grammar.Java7Parser.AssertStmtContext;
-import jplag.java17.grammar.Java7Parser.BlockContext;
-import jplag.java17.grammar.Java7Parser.BlockStatementContext;
-import jplag.java17.grammar.Java7Parser.BlockStmtContext;
-import jplag.java17.grammar.Java7Parser.BooleanLiteralContext;
-import jplag.java17.grammar.Java7Parser.BoundContext;
-import jplag.java17.grammar.Java7Parser.BreakContext;
-import jplag.java17.grammar.Java7Parser.CatchClauseContext;
-import jplag.java17.grammar.Java7Parser.CbdBlockContext;
-import jplag.java17.grammar.Java7Parser.CbdMemberContext;
-import jplag.java17.grammar.Java7Parser.CbdSemicolonContext;
-import jplag.java17.grammar.Java7Parser.ClassBodyContext;
-import jplag.java17.grammar.Java7Parser.ClassCreatorRestContext;
-import jplag.java17.grammar.Java7Parser.ClassDeclarationContext;
-import jplag.java17.grammar.Java7Parser.ClassOrInterfaceDeclarationContext;
-import jplag.java17.grammar.Java7Parser.ClassOrInterfaceTypeContext;
-import jplag.java17.grammar.Java7Parser.CompilationUnitContext;
-import jplag.java17.grammar.Java7Parser.ConstantDeclaratorContext;
-import jplag.java17.grammar.Java7Parser.ConstantDeclaratorRestContext;
-import jplag.java17.grammar.Java7Parser.ConstantDeclaratorsRestContext;
-import jplag.java17.grammar.Java7Parser.ConstantExpressionContext;
-import jplag.java17.grammar.Java7Parser.ConstructorDeclarationContext;
-import jplag.java17.grammar.Java7Parser.ContinueStmtContext;
-import jplag.java17.grammar.Java7Parser.CreatedNameContext;
-import jplag.java17.grammar.Java7Parser.CreatorContext;
-import jplag.java17.grammar.Java7Parser.DefaultValueContext;
-import jplag.java17.grammar.Java7Parser.DoWhileStmtContext;
-import jplag.java17.grammar.Java7Parser.ElementValueArrayInitializerContext;
-import jplag.java17.grammar.Java7Parser.ElementValueContext;
-import jplag.java17.grammar.Java7Parser.ElementValuePairContext;
-import jplag.java17.grammar.Java7Parser.ElementValuePairsContext;
-import jplag.java17.grammar.Java7Parser.EnhancedForControlContext;
-import jplag.java17.grammar.Java7Parser.EnumConstantContext;
-import jplag.java17.grammar.Java7Parser.EnumConstantNameContext;
-import jplag.java17.grammar.Java7Parser.EnumConstantsContext;
-import jplag.java17.grammar.Java7Parser.EnumDeclarationContext;
-import jplag.java17.grammar.Java7Parser.ExplicitConstructorInvocationContext;
-import jplag.java17.grammar.Java7Parser.ExplicitGenericInvocationContext;
-import jplag.java17.grammar.Java7Parser.ExprArrayExpressionContext;
-import jplag.java17.grammar.Java7Parser.ExprAssignmentContext;
-import jplag.java17.grammar.Java7Parser.ExprBinaryAndContext;
-import jplag.java17.grammar.Java7Parser.ExprBinaryBoolAndContext;
-import jplag.java17.grammar.Java7Parser.ExprBinaryBoolOrContext;
-import jplag.java17.grammar.Java7Parser.ExprBinaryEqualsContext;
-import jplag.java17.grammar.Java7Parser.ExprBinaryNotContext;
-import jplag.java17.grammar.Java7Parser.ExprBinaryOperatorAddContext;
-import jplag.java17.grammar.Java7Parser.ExprBinaryOperatorCompContext;
-import jplag.java17.grammar.Java7Parser.ExprBinaryOperatorGTContext;
-import jplag.java17.grammar.Java7Parser.ExprBinaryOperatorInstanceofContext;
-import jplag.java17.grammar.Java7Parser.ExprBinaryOperatorMultContext;
-import jplag.java17.grammar.Java7Parser.ExprBinaryOrContext;
-import jplag.java17.grammar.Java7Parser.ExprCastExpressionContext;
-import jplag.java17.grammar.Java7Parser.ExprConditionalExpressionContext;
-import jplag.java17.grammar.Java7Parser.ExprExplicitGenericInvocationContext;
-import jplag.java17.grammar.Java7Parser.ExprExpressionIncDecContext;
-import jplag.java17.grammar.Java7Parser.ExprIdentifierContext;
-import jplag.java17.grammar.Java7Parser.ExprIncDecExpressionContext;
-import jplag.java17.grammar.Java7Parser.ExprMethodExpressionListContext;
-import jplag.java17.grammar.Java7Parser.ExprNewCreatorContext;
-import jplag.java17.grammar.Java7Parser.ExprNewIdentidierContext;
-import jplag.java17.grammar.Java7Parser.ExprNotExpressionContext;
-import jplag.java17.grammar.Java7Parser.ExprPrimaryContext;
-import jplag.java17.grammar.Java7Parser.ExprSuperContext;
-import jplag.java17.grammar.Java7Parser.ExprSuperIdentifierContext;
-import jplag.java17.grammar.Java7Parser.ExprThisContext;
-import jplag.java17.grammar.Java7Parser.ExpressionListContext;
-import jplag.java17.grammar.Java7Parser.FieldDeclarationContext;
-import jplag.java17.grammar.Java7Parser.ForControlContext;
-import jplag.java17.grammar.Java7Parser.ForInitContext;
-import jplag.java17.grammar.Java7Parser.ForStmtContext;
-import jplag.java17.grammar.Java7Parser.ForUpdateContext;
-import jplag.java17.grammar.Java7Parser.FormalParameterDeclarationsContext;
-import jplag.java17.grammar.Java7Parser.FormalParameterVariablesContext;
-import jplag.java17.grammar.Java7Parser.FormalParametersContext;
-import jplag.java17.grammar.Java7Parser.IdentifiedStmtContext;
-import jplag.java17.grammar.Java7Parser.IfStmtContext;
-import jplag.java17.grammar.Java7Parser.ImportDeclarationContext;
-import jplag.java17.grammar.Java7Parser.InnerCreatorContext;
-import jplag.java17.grammar.Java7Parser.IntegerLiteralContext;
-import jplag.java17.grammar.Java7Parser.InterfaceBodyContext;
-import jplag.java17.grammar.Java7Parser.InterfaceDeclarationContext;
-import jplag.java17.grammar.Java7Parser.InterfaceGenericMethodDeclContext;
-import jplag.java17.grammar.Java7Parser.InterfaceMemberDeclContext;
-import jplag.java17.grammar.Java7Parser.InterfaceMethodDeclaratorRestContext;
-import jplag.java17.grammar.Java7Parser.InterfaceMethodOrFieldDeclContext;
-import jplag.java17.grammar.Java7Parser.InterfaceMethodOrFieldRestContext;
-import jplag.java17.grammar.Java7Parser.LiteralContext;
-import jplag.java17.grammar.Java7Parser.LocalVariableDeclarationContext;
-import jplag.java17.grammar.Java7Parser.MemberDeclContext;
-import jplag.java17.grammar.Java7Parser.MethodBodyContext;
-import jplag.java17.grammar.Java7Parser.MethodDeclarationContext;
-import jplag.java17.grammar.Java7Parser.ModifierContext;
-import jplag.java17.grammar.Java7Parser.NonWildcardTypeArgumentsContext;
-import jplag.java17.grammar.Java7Parser.NormalClassDeclarationContext;
-import jplag.java17.grammar.Java7Parser.NormalInterfaceDeclarationContext;
-import jplag.java17.grammar.Java7Parser.PackageDeclarationContext;
-import jplag.java17.grammar.Java7Parser.PackageOrTypeNameContext;
-import jplag.java17.grammar.Java7Parser.ParExpressionContext;
-import jplag.java17.grammar.Java7Parser.PrimaryContext;
-import jplag.java17.grammar.Java7Parser.PrimitiveTypeContext;
-import jplag.java17.grammar.Java7Parser.QualifiedIdentifierContext;
-import jplag.java17.grammar.Java7Parser.QualifiedIdentifierListContext;
-import jplag.java17.grammar.Java7Parser.ResourceContext;
-import jplag.java17.grammar.Java7Parser.ResourcesContext;
-import jplag.java17.grammar.Java7Parser.ReturnStmtContext;
-import jplag.java17.grammar.Java7Parser.SemicStmtContext;
-import jplag.java17.grammar.Java7Parser.StatementExpressStmtContext;
-import jplag.java17.grammar.Java7Parser.StatementExpressionContext;
-import jplag.java17.grammar.Java7Parser.SwitchBlockContext;
-import jplag.java17.grammar.Java7Parser.SwitchBlockStatementGroupContext;
-import jplag.java17.grammar.Java7Parser.SwitchLabelContext;
-import jplag.java17.grammar.Java7Parser.SwitchStmtContext;
-import jplag.java17.grammar.Java7Parser.SynchronizedStmtContext;
-import jplag.java17.grammar.Java7Parser.ThrowStmtContext;
-import jplag.java17.grammar.Java7Parser.TryStatementContext;
-import jplag.java17.grammar.Java7Parser.TryStmtContext;
-import jplag.java17.grammar.Java7Parser.TypeArgumentContext;
-import jplag.java17.grammar.Java7Parser.TypeArgumentsContext;
-import jplag.java17.grammar.Java7Parser.TypeDeclarationContext;
-import jplag.java17.grammar.Java7Parser.TypeListContext;
-import jplag.java17.grammar.Java7Parser.TypeNameContext;
-import jplag.java17.grammar.Java7Parser.TypeParameterContext;
-import jplag.java17.grammar.Java7Parser.TypeParametersContext;
-import jplag.java17.grammar.Java7Parser.TypeRefContext;
-import jplag.java17.grammar.Java7Parser.VariableDeclaratorContext;
-import jplag.java17.grammar.Java7Parser.VariableDeclaratorIdContext;
-import jplag.java17.grammar.Java7Parser.VariableDeclaratorsContext;
-import jplag.java17.grammar.Java7Parser.VariableInitializerContext;
-import jplag.java17.grammar.Java7Parser.VariableModifierContext;
-import jplag.java17.grammar.Java7Parser.VoidInterfaceMethodDeclaratorRestContext;
-import jplag.java17.grammar.Java7Parser.WhileStmtContext;
-
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.tree.ErrorNode;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.TerminalNode;
 
+import jplag.java17.grammar.Java7Listener;
+import jplag.java17.grammar.Java7Parser.*;
+
 public class JplagJava7Listener implements Java7Listener, JavaTokenConstants {
 
 	private jplag.java17.Parser jplagParser;

jplag.frontend.java-1.7/src/main/java/jplag/java17/Parser.java

@@ -7,16 +7,16 @@ import java.io.FileInputStream;
 import java.io.FileReader;
 import java.io.IOException;
 
-import jplag.Structure;
-import jplag.java17.grammar.Java7Lexer;
-import jplag.java17.grammar.Java7Parser;
-import jplag.java17.grammar.Java7Parser.CompilationUnitContext;
-
 import org.antlr.v4.runtime.ANTLRInputStream;
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.ParseTreeWalker;
 
+import jplag.Structure;
+import jplag.java17.grammar.Java7Lexer;
+import jplag.java17.grammar.Java7Parser;
+import jplag.java17.grammar.Java7Parser.CompilationUnitContext;
+
 public class Parser extends jplag.Parser implements JavaTokenConstants {
 	private Structure struct = new Structure();
 	private String currentFile;

jplag.frontend.java-1.7/src/test/java/jplag/antlr4Learning/Antlr4LearningTests.java

@@ -5,10 +5,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 
-import jplag.java17.JplagJava7Listener;
-import jplag.java17.grammar.Java7Lexer;
-import jplag.java17.grammar.Java7Parser;
-
 import org.antlr.v4.runtime.ANTLRInputStream;
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.Token;
@@ -17,6 +13,10 @@ import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 
+import jplag.java17.JplagJava7Listener;
+import jplag.java17.grammar.Java7Lexer;
+import jplag.java17.grammar.Java7Parser;
+
 public class Antlr4LearningTests {
 	private static File srcTestResources;
 

jplag.frontend.java-1.7/src/test/java/jplag/java17/ParserTest.java

@@ -7,10 +7,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 
-import jplag.StrippedProgram;
-import jplag.java17.grammar.Java7Lexer;
-import jplag.java17.grammar.Java7Parser;
-
 import org.antlr.v4.runtime.ANTLRInputStream;
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.junit.Assert;
@@ -18,6 +14,10 @@ import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 
+import jplag.StrippedProgram;
+import jplag.java17.grammar.Java7Lexer;
+import jplag.java17.grammar.Java7Parser;
+
 public class ParserTest {
 
 	private static File srcTestResources;

jplag.frontend.python-3/src/main/java/jplag/python3/JplagPython3Listener.java

@@ -1,11 +1,13 @@
 package jplag.python3;
 
-import jplag.python3.grammar.*;
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.misc.NotNull;
 import org.antlr.v4.runtime.tree.ErrorNode;
 import org.antlr.v4.runtime.tree.TerminalNode;
 
+import jplag.python3.grammar.Python3Listener;
+import jplag.python3.grammar.Python3Parser;
+
 public class JplagPython3Listener implements Python3Listener, Python3TokenConstants {
 
     private jplag.python3.Parser jplagParser;

jplag.frontend.python-3/src/main/java/jplag/python3/Parser.java

@@ -7,16 +7,16 @@ import java.io.FileInputStream;
 import java.io.FileReader;
 import java.io.IOException;
 
-import jplag.Structure;
-import jplag.python3.grammar.Python3Lexer;
-import jplag.python3.grammar.Python3Parser;
-import jplag.python3.grammar.Python3Parser.File_inputContext;
-
 import org.antlr.v4.runtime.ANTLRInputStream;
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.ParseTreeWalker;
 
+import jplag.Structure;
+import jplag.python3.grammar.Python3Lexer;
+import jplag.python3.grammar.Python3Parser;
+import jplag.python3.grammar.Python3Parser.File_inputContext;
+
 public class Parser extends jplag.Parser implements Python3TokenConstants {
 
     private Structure struct = new Structure();

jplag.frontend.scheme/src/main/java/jplag/scheme/InsertStream.java

@@ -1,6 +1,10 @@
 package jplag.scheme;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileDescriptor;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
 
 public class InsertStream extends FileInputStream {
   public InsertStream(File file) throws FileNotFoundException {