Author: ggregory Date: Thu Oct 11 14:02:33 2012 New Revision: 1397059 URL: http://svn.apache.org/viewvc?rev=1397059&view=rev Log: Organize imports.
Modified: commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVLexer.java commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVParser.java commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/Token.java commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVFormatTest.java commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer1.java commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer1306663.java commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer1306667.java commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer3.java commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexerTest.java commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVParserTest.java commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVPrinterTest.java commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/ExtendedBufferedReaderTest.java Modified: commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVLexer.java URL: http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVLexer.java?rev=1397059&r1=1397058&r2=1397059&view=diff ============================================================================== --- commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVLexer.java (original) +++ commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVLexer.java Thu Oct 11 14:02:33 2012 @@ -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 { Modified: commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVParser.java URL: http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVParser.java?rev=1397059&r1=1397058&r2=1397059&view=diff ============================================================================== --- commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVParser.java (original) +++ commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVParser.java Thu Oct 11 14:02:33 2012 @@ -23,7 +23,6 @@ import java.io.IOException; 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; Modified: commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/Token.java URL: http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/Token.java?rev=1397059&r1=1397058&r2=1397059&view=diff ============================================================================== --- commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/Token.java (original) +++ commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/Token.java Thu Oct 11 14:02:33 2012 @@ -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. Modified: commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVFormatTest.java URL: http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVFormatTest.java?rev=1397059&r1=1397058&r2=1397059&view=diff ============================================================================== --- commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVFormatTest.java (original) +++ commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVFormatTest.java Thu Oct 11 14:02:33 2012 @@ -17,6 +17,12 @@ 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; @@ -24,8 +30,6 @@ import java.io.ObjectOutputStream; import org.junit.Test; -import static org.junit.Assert.*; - public class CSVFormatTest { @Test Modified: commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer1.java URL: http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer1.java?rev=1397059&r1=1397058&r2=1397059&view=diff ============================================================================== --- commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer1.java (original) +++ commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer1.java Thu Oct 11 14:02:33 2012 @@ -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 { Modified: commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer1306663.java URL: http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer1306663.java?rev=1397059&r1=1397058&r2=1397059&view=diff ============================================================================== --- commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer1306663.java (original) +++ commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer1306663.java Thu Oct 11 14:02:33 2012 @@ -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 { Modified: commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer1306667.java URL: http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer1306667.java?rev=1397059&r1=1397058&r2=1397059&view=diff ============================================================================== --- commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer1306667.java (original) +++ commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer1306667.java Thu Oct 11 14:02:33 2012 @@ -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 { Modified: commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer3.java URL: http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer3.java?rev=1397059&r1=1397058&r2=1397059&view=diff ============================================================================== --- commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer3.java (original) +++ commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexer3.java Thu Oct 11 14:02:33 2012 @@ -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. Modified: commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexerTest.java URL: http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexerTest.java?rev=1397059&r1=1397058&r2=1397059&view=diff ============================================================================== --- commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexerTest.java (original) +++ commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexerTest.java Thu Oct 11 14:02:33 2012 @@ -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) { Modified: commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVParserTest.java URL: http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVParserTest.java?rev=1397059&r1=1397058&r2=1397059&view=diff ============================================================================== --- commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVParserTest.java (original) +++ commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVParserTest.java Thu Oct 11 14:02:33 2012 @@ -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 junit.framework.Assert; import org.junit.Ignore; import org.junit.Test; -import static org.junit.Assert.*; - /** * CSVParserTest * Modified: commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVPrinterTest.java URL: http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVPrinterTest.java?rev=1397059&r1=1397058&r2=1397059&view=diff ============================================================================== --- commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVPrinterTest.java (original) +++ commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVPrinterTest.java Thu Oct 11 14:02:33 2012 @@ -17,6 +17,8 @@ package org.apache.commons.csv; +import static org.junit.Assert.assertEquals; + import java.io.IOException; import java.io.StringWriter; import java.util.List; @@ -24,8 +26,6 @@ import java.util.Random; import org.junit.Test; -import static org.junit.Assert.*; - public class CSVPrinterTest { String lineSeparator = CSVFormat.DEFAULT.getLineSeparator(); Modified: commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/ExtendedBufferedReaderTest.java URL: http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/ExtendedBufferedReaderTest.java?rev=1397059&r1=1397058&r2=1397059&view=diff ============================================================================== --- commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/ExtendedBufferedReaderTest.java (original) +++ commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/ExtendedBufferedReaderTest.java Thu Oct 11 14:02:33 2012 @@ -17,12 +17,14 @@ package org.apache.commons.csv; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + import java.io.StringReader; import org.junit.Test; -import static org.junit.Assert.*; - public class ExtendedBufferedReaderTest { @Test