Organize imports.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1397059 13f79535-47bb-0310-9956-ffa450edef68

Author: garydgregory

src/main/java/org/apache/commons/csv/CSVLexer.java

@@ -17,9 +17,13 @@
 
 package org.apache.commons.csv;
 
-import java.io.IOException;
+import static org.apache.commons.csv.Token.Type.COMMENT;
+import static org.apache.commons.csv.Token.Type.EOF;
+import static org.apache.commons.csv.Token.Type.EORECORD;
+import static org.apache.commons.csv.Token.Type.INVALID;
+import static org.apache.commons.csv.Token.Type.TOKEN;
 
-import static org.apache.commons.csv.Token.Type.*;
+import java.io.IOException;
 
 class CSVLexer extends Lexer {
 

src/main/java/org/apache/commons/csv/CSVParser.java

@@ -23,7 +23,6 @@
 import java.io.Reader;
 import java.io.StringReader;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;

src/main/java/org/apache/commons/csv/Token.java

@@ -17,7 +17,7 @@
 
 package org.apache.commons.csv;
 
-import static org.apache.commons.csv.Token.Type.*;
+import static org.apache.commons.csv.Token.Type.INVALID;
 
 /**
  * Token is an internal token representation.

src/test/java/org/apache/commons/csv/CSVFormatTest.java

@@ -17,15 +17,19 @@
 
 package org.apache.commons.csv;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-
 public class CSVFormatTest {
 
     @Test

src/test/java/org/apache/commons/csv/CSVLexer1.java

@@ -17,9 +17,11 @@
 
 package org.apache.commons.csv;
 
-import java.io.IOException;
+import static org.apache.commons.csv.Token.Type.EOF;
+import static org.apache.commons.csv.Token.Type.EORECORD;
+import static org.apache.commons.csv.Token.Type.TOKEN;
 
-import static org.apache.commons.csv.Token.Type.*;
+import java.io.IOException;
 
 class CSVLexer1 extends Lexer {
 

src/test/java/org/apache/commons/csv/CSVLexer1306663.java

@@ -17,9 +17,13 @@
 
 package org.apache.commons.csv;
 
-import java.io.IOException;
+import static org.apache.commons.csv.Token.Type.COMMENT;
+import static org.apache.commons.csv.Token.Type.EOF;
+import static org.apache.commons.csv.Token.Type.EORECORD;
+import static org.apache.commons.csv.Token.Type.INVALID;
+import static org.apache.commons.csv.Token.Type.TOKEN;
 
-import static org.apache.commons.csv.Token.Type.*;
+import java.io.IOException;
 
 class CSVLexer1306663 extends Lexer {
 

src/test/java/org/apache/commons/csv/CSVLexer1306667.java

@@ -17,9 +17,13 @@
 
 package org.apache.commons.csv;
 
-import java.io.IOException;
+import static org.apache.commons.csv.Token.Type.COMMENT;
+import static org.apache.commons.csv.Token.Type.EOF;
+import static org.apache.commons.csv.Token.Type.EORECORD;
+import static org.apache.commons.csv.Token.Type.INVALID;
+import static org.apache.commons.csv.Token.Type.TOKEN;
 
-import static org.apache.commons.csv.Token.Type.*;
+import java.io.IOException;
 
 class CSVLexer1306667 extends Lexer {
 

src/test/java/org/apache/commons/csv/CSVLexer3.java

@@ -17,9 +17,13 @@
 
 package org.apache.commons.csv;
 
-import java.io.IOException;
+import static org.apache.commons.csv.Token.Type.COMMENT;
+import static org.apache.commons.csv.Token.Type.EOF;
+import static org.apache.commons.csv.Token.Type.EORECORD;
+import static org.apache.commons.csv.Token.Type.INVALID;
+import static org.apache.commons.csv.Token.Type.TOKEN;
 
-import static org.apache.commons.csv.Token.Type.*;
+import java.io.IOException;
 
 /**
  * Experimental Lexer using enums to keep track of state and character type.

src/test/java/org/apache/commons/csv/CSVLexerTest.java

@@ -17,14 +17,20 @@
 
 package org.apache.commons.csv;
 
+import static org.apache.commons.csv.Token.Type.COMMENT;
+import static org.apache.commons.csv.Token.Type.EOF;
+import static org.apache.commons.csv.Token.Type.EORECORD;
+import static org.apache.commons.csv.Token.Type.TOKEN;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.io.IOException;
 import java.io.StringReader;
 
 import org.junit.Test;
 
-import static org.apache.commons.csv.Token.Type.*;
-import static org.junit.Assert.*;
-
 public class CSVLexerTest {
 
     private Lexer getLexer(String input, CSVFormat format) {

src/test/java/org/apache/commons/csv/CSVParserTest.java

@@ -17,6 +17,14 @@
 
 package org.apache.commons.csv;
 
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
@@ -31,8 +39,6 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-
 /**
  * CSVParserTest
  *