Clean up imports in non-generated code

src/main/java/org/sablecc/sablecc/AcceptStates.java

@@ -7,9 +7,8 @@
 
 package org.sablecc.sablecc;
 
-import org.sablecc.sablecc.analysis.*;
-import org.sablecc.sablecc.node.*;
-import java.util.*;
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
+import org.sablecc.sablecc.node.Start;
 
 public class AcceptStates extends DepthFirstAdapter
 {

src/main/java/org/sablecc/sablecc/AddAstProductions.java

@@ -7,10 +7,11 @@
 
 package org.sablecc.sablecc;
 
-import org.sablecc.sablecc.analysis.*;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
 import org.sablecc.sablecc.node.*;
-import java.util.*;
-import java.io.*;
 
 /*
  * AddAstProductions

src/main/java/org/sablecc/sablecc/AddEventualEmptyTransformationToProductions.java

@@ -7,10 +7,10 @@
 
 package org.sablecc.sablecc;
 
-import org.sablecc.sablecc.analysis.*;
+import java.util.LinkedList;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
 import org.sablecc.sablecc.node.*;
-import java.util.*;
-import java.io.*;
 
 /*
  * AddEventualEmptyTransformationToProductions

src/main/java/org/sablecc/sablecc/AddProdTransformAndAltTransform.java

@@ -7,10 +7,11 @@
 
 package org.sablecc.sablecc;
 
-import org.sablecc.sablecc.analysis.*;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
 import org.sablecc.sablecc.node.*;
-import java.util.*;
-import java.io.*;
 
 /*
  * AddProdTransformAndAltTransform

src/main/java/org/sablecc/sablecc/AltTransformAdapter.java

@@ -7,10 +7,11 @@
 
 package org.sablecc.sablecc;
 
-import java.util.*;
-import org.sablecc.sablecc.analysis.*;
+import java.util.List;
+import java.util.Map;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
 import org.sablecc.sablecc.node.*;
-import java.io.*;
 
 public class AltTransformAdapter extends DepthFirstAdapter
 {

src/main/java/org/sablecc/sablecc/AlternativeElementTypes.java

@@ -7,10 +7,11 @@
 
 package org.sablecc.sablecc;
 
-import org.sablecc.sablecc.analysis.*;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
 import org.sablecc.sablecc.node.*;
-import java.util.*;
-import java.io.*;
 
 public class AlternativeElementTypes extends DepthFirstAdapter
 {

src/main/java/org/sablecc/sablecc/CharSet.java

@@ -7,7 +7,9 @@
 
 package org.sablecc.sablecc;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 
 public class CharSet implements Cloneable
 {

src/main/java/org/sablecc/sablecc/ComputeCGNomenclature.java

@@ -19,10 +19,11 @@
 
 package org.sablecc.sablecc;
 
-import org.sablecc.sablecc.analysis.*;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
 import org.sablecc.sablecc.node.*;
-import java.util.*;
-import java.io.*;
 
 public class ComputeCGNomenclature extends DepthFirstAdapter
 {

src/main/java/org/sablecc/sablecc/ComputeInlining.java

@@ -7,8 +7,11 @@
 
 package org.sablecc.sablecc;
 
-import java.util.*;
-import org.sablecc.sablecc.analysis.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
 import org.sablecc.sablecc.node.*;
 
 /*

src/main/java/org/sablecc/sablecc/ComputeSimpleTermPosition.java

@@ -7,10 +7,11 @@
 
 package org.sablecc.sablecc;
 
-import org.sablecc.sablecc.analysis.*;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
 import org.sablecc.sablecc.node.*;
-import java.util.*;
-import java.io.*;
 
 public class ComputeSimpleTermPosition extends DepthFirstAdapter
 {

src/main/java/org/sablecc/sablecc/ConflictException.java

@@ -7,7 +7,6 @@
 
 package org.sablecc.sablecc;
 
-import org.sablecc.sablecc.node.*;
 import java.util.Set;
 
 @SuppressWarnings("serial")

src/main/java/org/sablecc/sablecc/ConstructNFA.java

@@ -7,8 +7,13 @@
 
 package org.sablecc.sablecc;
 
-import java.util.*;
-import org.sablecc.sablecc.analysis.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
 import org.sablecc.sablecc.node.*;
 
 public class ConstructNFA extends DepthFirstAdapter

src/main/java/org/sablecc/sablecc/ConstructParserGenerationDatas.java

@@ -7,8 +7,9 @@
 
 package org.sablecc.sablecc;
 
-import java.util.*;
-import org.sablecc.sablecc.analysis.*;
+import java.util.Map;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
 import org.sablecc.sablecc.node.*;
 
 public class ConstructParserGenerationDatas extends DepthFirstAdapter

src/main/java/org/sablecc/sablecc/ConstructProdsMap.java

@@ -7,9 +7,11 @@
 
 package org.sablecc.sablecc;
 
-import java.util.*;
-import org.sablecc.sablecc.analysis.*;
-import org.sablecc.sablecc.node.*;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
+import org.sablecc.sablecc.node.AProd;
 
 public class ConstructProdsMap extends DepthFirstAdapter
 {

src/main/java/org/sablecc/sablecc/DisplayLicense.java

@@ -7,7 +7,9 @@
 
 package org.sablecc.sablecc;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
 
 class DisplayLicense
 {

src/main/java/org/sablecc/sablecc/GenAlts.java

@@ -7,10 +7,17 @@
 
 package org.sablecc.sablecc;
 
-import org.sablecc.sablecc.analysis.*;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
 import org.sablecc.sablecc.node.*;
-import java.util.*;
-import java.io.*;
 
 public class GenAlts extends DepthFirstAdapter
 {

src/main/java/org/sablecc/sablecc/GenAnalyses.java

@@ -7,10 +7,17 @@
 
 package org.sablecc.sablecc;
 
-import org.sablecc.sablecc.analysis.*;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
 import org.sablecc.sablecc.node.*;
-import java.util.*;
-import java.io.*;
 
 public class GenAnalyses extends DepthFirstAdapter
 {

src/main/java/org/sablecc/sablecc/GenLexer.java

@@ -7,10 +7,23 @@
 
 package org.sablecc.sablecc;
 
-import java.util.*;
-import org.sablecc.sablecc.analysis.*;
-import org.sablecc.sablecc.node.*;
-import java.io.*;
+import java.io.BufferedOutputStream;
+import java.io.BufferedWriter;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+
+import org.sablecc.sablecc.analysis.AnalysisAdapter;
+import org.sablecc.sablecc.node.ATokenDef;
+import org.sablecc.sablecc.node.Start;
 
 public class GenLexer extends AnalysisAdapter
 {

src/main/java/org/sablecc/sablecc/GenParser.java

@@ -7,10 +7,24 @@
 
 package org.sablecc.sablecc;
 
-import java.util.*;
-import org.sablecc.sablecc.analysis.*;
+import java.io.BufferedOutputStream;
+import java.io.BufferedWriter;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
 import org.sablecc.sablecc.node.*;
-import java.io.*;
 
 /*
  * GenParser

src/main/java/org/sablecc/sablecc/GenProds.java

@@ -7,10 +7,14 @@
 
 package org.sablecc.sablecc;
 
-import org.sablecc.sablecc.analysis.*;
-import org.sablecc.sablecc.node.*;
-import java.util.*;
-import java.io.*;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
+import org.sablecc.sablecc.node.AAstProd;
 
 public class GenProds extends DepthFirstAdapter
 {