Expand star imports to minimize namespace conflicts.

Signed-off-by: John May <john.wilkinsonmay@gmail.com>
cdk · Oct 2, 2014 · a32ada7 · a32ada7
1 parent 348884e
commit a32ada7
Show file tree

Hide file tree

Showing 66 changed files with 541 additions and 280 deletions.
diff --git a/base/annotation/src/main/java/org/openscience/cdk/annotations/TestMethod.java b/base/annotation/src/main/java/org/openscience/cdk/annotations/TestMethod.java
@@ -22,7 +22,11 @@
  */
 package org.openscience.cdk.annotations;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * An annotation for source classes to indicate the specific test class and method that tests the source class.

diff --git a/base/data/src/main/java/org/openscience/cdk/ConformerContainer.java b/base/data/src/main/java/org/openscience/cdk/ConformerContainer.java
@@ -18,14 +18,19 @@
  */
 package org.openscience.cdk;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+
+import javax.vecmath.Point3d;
+
 import org.openscience.cdk.annotations.TestClass;
 import org.openscience.cdk.annotations.TestMethod;
 import org.openscience.cdk.interfaces.IAtom;
 import org.openscience.cdk.interfaces.IAtomContainer;
 
-import javax.vecmath.Point3d;
-import java.util.*;
-
 /**
  * A memory-efficient data structure to store conformers for a single molecule.
  * <p/>

diff --git a/base/data/src/main/java/org/openscience/cdk/RingSet.java b/base/data/src/main/java/org/openscience/cdk/RingSet.java
@@ -19,10 +19,14 @@
 
 package org.openscience.cdk;
 
-import org.openscience.cdk.interfaces.*;
-
 import java.io.Serializable;
 
+import org.openscience.cdk.interfaces.IAtom;
+import org.openscience.cdk.interfaces.IAtomContainer;
+import org.openscience.cdk.interfaces.IBond;
+import org.openscience.cdk.interfaces.IRing;
+import org.openscience.cdk.interfaces.IRingSet;
+
 /**
  * Maintains a set of Ring objects.
  *

diff --git a/base/data/src/test/java/org/openscience/cdk/PolymerTest.java b/base/data/src/test/java/org/openscience/cdk/PolymerTest.java
@@ -22,10 +22,16 @@
  *  */
 package org.openscience.cdk;
 
+import org.openscience.cdk.interfaces.AbstractPolymerTest;
+import org.openscience.cdk.interfaces.IAtom;
+import org.openscience.cdk.interfaces.IChemObject;
+import org.openscience.cdk.interfaces.IMonomer;
+import org.openscience.cdk.interfaces.IPolymer;
+import org.openscience.cdk.interfaces.ITestObjectBuilder;
+
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.openscience.cdk.interfaces.*;
 
 /**
  * TestCase for the Polymer class.

diff --git a/base/data/src/test/java/org/openscience/cdk/PseudoAtomTest.java b/base/data/src/test/java/org/openscience/cdk/PseudoAtomTest.java
@@ -19,13 +19,18 @@
  */
 package org.openscience.cdk;
 
+import javax.vecmath.Point2d;
+import javax.vecmath.Point3d;
+
+import org.openscience.cdk.interfaces.AbstractPseudoAtomTest;
+import org.openscience.cdk.interfaces.IChemObject;
+import org.openscience.cdk.interfaces.IElement;
+import org.openscience.cdk.interfaces.IPseudoAtom;
+import org.openscience.cdk.interfaces.ITestObjectBuilder;
+
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.openscience.cdk.interfaces.*;
-
-import javax.vecmath.Point2d;
-import javax.vecmath.Point3d;
 
 /**
  * Checks the functionality of the AtomTypeFactory

diff --git a/base/silent/src/main/java/org/openscience/cdk/silent/RingSet.java b/base/silent/src/main/java/org/openscience/cdk/silent/RingSet.java
@@ -19,10 +19,14 @@
 
 package org.openscience.cdk.silent;
 
-import org.openscience.cdk.interfaces.*;
-
 import java.io.Serializable;
 
+import org.openscience.cdk.interfaces.IAtom;
+import org.openscience.cdk.interfaces.IAtomContainer;
+import org.openscience.cdk.interfaces.IBond;
+import org.openscience.cdk.interfaces.IRing;
+import org.openscience.cdk.interfaces.IRingSet;
+
 /**
  * Maintains a set of Ring objects.
  *

diff --git a/base/standard/src/main/java/org/openscience/cdk/graph/ConnectivityChecker.java b/base/standard/src/main/java/org/openscience/cdk/graph/ConnectivityChecker.java
@@ -19,14 +19,22 @@
  */
 package org.openscience.cdk.graph;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.openscience.cdk.annotations.TestClass;
 import org.openscience.cdk.annotations.TestMethod;
-import org.openscience.cdk.interfaces.*;
+import org.openscience.cdk.interfaces.IAtom;
+import org.openscience.cdk.interfaces.IAtomContainer;
+import org.openscience.cdk.interfaces.IAtomContainerSet;
+import org.openscience.cdk.interfaces.IBond;
+import org.openscience.cdk.interfaces.IDoubleBondStereochemistry;
+import org.openscience.cdk.interfaces.ILonePair;
+import org.openscience.cdk.interfaces.ISingleElectron;
+import org.openscience.cdk.interfaces.IStereoElement;
+import org.openscience.cdk.interfaces.ITetrahedralChirality;
 import org.openscience.cdk.stereo.ExtendedTetrahedral;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * Tool class for checking whether the (sub)structure in an
  * AtomContainer is connected.

diff --git a/base/standard/src/main/java/org/openscience/cdk/qsar/DescriptorValue.java b/base/standard/src/main/java/org/openscience/cdk/qsar/DescriptorValue.java
@@ -22,7 +22,12 @@
 
 import org.openscience.cdk.annotations.TestClass;
 import org.openscience.cdk.annotations.TestMethod;
-import org.openscience.cdk.qsar.result.*;
+import org.openscience.cdk.qsar.result.BooleanResult;
+import org.openscience.cdk.qsar.result.DoubleArrayResult;
+import org.openscience.cdk.qsar.result.DoubleResult;
+import org.openscience.cdk.qsar.result.IDescriptorResult;
+import org.openscience.cdk.qsar.result.IntegerArrayResult;
+import org.openscience.cdk.qsar.result.IntegerResult;
 
 /**
  * Class that is used to store descriptor values as IChemObject properties.

diff --git a/base/standard/src/main/java/org/openscience/cdk/tools/manipulator/ChemFileManipulator.java b/base/standard/src/main/java/org/openscience/cdk/tools/manipulator/ChemFileManipulator.java
@@ -22,13 +22,18 @@
  */
 package org.openscience.cdk.tools.manipulator;
 
-import org.openscience.cdk.annotations.TestClass;
-import org.openscience.cdk.annotations.TestMethod;
-import org.openscience.cdk.interfaces.*;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import org.openscience.cdk.annotations.TestClass;
+import org.openscience.cdk.annotations.TestMethod;
+import org.openscience.cdk.interfaces.IAtomContainer;
+import org.openscience.cdk.interfaces.IChemFile;
+import org.openscience.cdk.interfaces.IChemModel;
+import org.openscience.cdk.interfaces.IChemObject;
+import org.openscience.cdk.interfaces.IChemSequence;
+import org.openscience.cdk.interfaces.IReaction;
+
 /**
  * Class with convenience methods that provide methods from
  * methods from ChemObjects within the ChemFile.

diff --git a/...standard/src/main/java/org/openscience/cdk/tools/manipulator/ChemSequenceManipulator.java b/...standard/src/main/java/org/openscience/cdk/tools/manipulator/ChemSequenceManipulator.java
@@ -22,13 +22,16 @@
  *  */
 package org.openscience.cdk.tools.manipulator;
 
-import org.openscience.cdk.annotations.TestClass;
-import org.openscience.cdk.annotations.TestMethod;
-import org.openscience.cdk.interfaces.*;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import org.openscience.cdk.annotations.TestClass;
+import org.openscience.cdk.annotations.TestMethod;
+import org.openscience.cdk.interfaces.IAtomContainer;
+import org.openscience.cdk.interfaces.IChemModel;
+import org.openscience.cdk.interfaces.IChemObject;
+import org.openscience.cdk.interfaces.IChemSequence;
+
 /**
  * Class with convenience methods that provide methods from
  * methods from ChemObjects within the ChemSequence.

diff --git a/.../standard/src/main/java/org/openscience/cdk/tools/manipulator/MoleculeSetManipulator.java b/.../standard/src/main/java/org/openscience/cdk/tools/manipulator/MoleculeSetManipulator.java
@@ -22,13 +22,18 @@
  */
 package org.openscience.cdk.tools.manipulator;
 
-import org.openscience.cdk.annotations.TestClass;
-import org.openscience.cdk.annotations.TestMethod;
-import org.openscience.cdk.interfaces.*;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import org.openscience.cdk.annotations.TestClass;
+import org.openscience.cdk.annotations.TestMethod;
+import org.openscience.cdk.interfaces.IAtom;
+import org.openscience.cdk.interfaces.IAtomContainer;
+import org.openscience.cdk.interfaces.IAtomContainerSet;
+import org.openscience.cdk.interfaces.IBond;
+import org.openscience.cdk.interfaces.IChemObject;
+import org.openscience.cdk.interfaces.IElectronContainer;
+
 /**
  * @cdk.module standard
  * @cdk.githash

diff --git a/base/standard/src/main/java/org/openscience/cdk/tools/manipulator/RingSetManipulator.java b/base/standard/src/main/java/org/openscience/cdk/tools/manipulator/RingSetManipulator.java
@@ -22,15 +22,19 @@
  */
 package org.openscience.cdk.tools.manipulator;
 
-import org.openscience.cdk.annotations.TestClass;
-import org.openscience.cdk.annotations.TestMethod;
-import org.openscience.cdk.interfaces.*;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
+import org.openscience.cdk.annotations.TestClass;
+import org.openscience.cdk.annotations.TestMethod;
+import org.openscience.cdk.interfaces.IAtom;
+import org.openscience.cdk.interfaces.IAtomContainer;
+import org.openscience.cdk.interfaces.IBond;
+import org.openscience.cdk.interfaces.IRing;
+import org.openscience.cdk.interfaces.IRingSet;
+
 /**
  * @cdk.module standard
  * @cdk.githash

diff --git a/base/test-core/src/test/java/org/openscience/cdk/config/AtomTypeFactoryTest.java b/base/test-core/src/test/java/org/openscience/cdk/config/AtomTypeFactoryTest.java
@@ -18,32 +18,38 @@
  */
 package org.openscience.cdk.config;
 
-import org.junit.Assert;
-import org.junit.Test;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
+
 import org.openscience.cdk.CDKConstants;
-import org.openscience.cdk.ChemObject;
 import org.openscience.cdk.CDKTestCase;
+import org.openscience.cdk.ChemObject;
 import org.openscience.cdk.interfaces.IAtom;
 import org.openscience.cdk.interfaces.IAtomType;
 import org.openscience.cdk.interfaces.IAtomType.Hybridization;
 import org.openscience.cdk.interfaces.IBond;
 import org.openscience.cdk.interfaces.IBond.Order;
+
+import org.junit.Assert;
+import org.junit.Test;
 import org.w3c.dom.Document;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 
-import javax.xml.XMLConstants;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.Source;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
-import javax.xml.validation.Validator;
-import java.io.*;
-
 /**
  * Checks the functionality of the AtomTypeFactory.
  *

diff --git a/base/test-core/src/test/java/org/openscience/cdk/graph/EssentialCyclesTest.java b/base/test-core/src/test/java/org/openscience/cdk/graph/EssentialCyclesTest.java
@@ -23,16 +23,16 @@
  */
 package org.openscience.cdk.graph;
 
-import org.junit.Test;
-
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertThat;
 import static org.openscience.cdk.graph.InitialCyclesTest.anthracene;
 import static org.openscience.cdk.graph.InitialCyclesTest.bicyclo;
 import static org.openscience.cdk.graph.InitialCyclesTest.cyclophane_even;
 import static org.openscience.cdk.graph.InitialCyclesTest.naphthalene;
 import static org.openscience.cdk.graph.InitialCyclesTest.norbornane;
 
+import org.junit.Test;
+
 /**
  * @author John May
  * @cdk.module test-core

diff --git a/base/test-core/src/test/java/org/openscience/cdk/graph/GraphUtilTest.java b/base/test-core/src/test/java/org/openscience/cdk/graph/GraphUtilTest.java
@@ -23,17 +23,20 @@
  */
 package org.openscience.cdk.graph;
 
-import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+
 import org.openscience.cdk.Atom;
 import org.openscience.cdk.AtomContainer;
 import org.openscience.cdk.Bond;
 import org.openscience.cdk.interfaces.IAtom;
 import org.openscience.cdk.interfaces.IAtomContainer;
 import org.openscience.cdk.interfaces.IBond;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.sameInstance;
-import static org.junit.Assert.*;
+import org.junit.Test;
 
 /**
  * @author John May

diff --git a/base/test-core/src/test/java/org/openscience/cdk/graph/GreedyBasisTest.java b/base/test-core/src/test/java/org/openscience/cdk/graph/GreedyBasisTest.java
@@ -23,18 +23,22 @@
  */
 package org.openscience.cdk.graph;
 
-import org.junit.Test;
-
-import java.util.Arrays;
-import java.util.BitSet;
-
 import static org.hamcrest.CoreMatchers.hasItem;
 import static org.hamcrest.CoreMatchers.hasItems;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 import static org.openscience.cdk.graph.BitMatrixTest.toBitSet;
-import static org.openscience.cdk.graph.InitialCycles.Cycle;
+
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.openscience.cdk.graph.InitialCycles.Cycle;
+
+import org.junit.Test;
 
 /**
  * @author John May

diff --git a/base/test-core/src/test/java/org/openscience/cdk/graph/MinimumCycleBasisTest.java b/base/test-core/src/test/java/org/openscience/cdk/graph/MinimumCycleBasisTest.java
@@ -23,16 +23,16 @@
  */
 package org.openscience.cdk.graph;
 
-import org.junit.Test;
-
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertThat;
 import static org.openscience.cdk.graph.InitialCyclesTest.anthracene;
 import static org.openscience.cdk.graph.InitialCyclesTest.bicyclo;
 import static org.openscience.cdk.graph.InitialCyclesTest.cyclophane_even;
 import static org.openscience.cdk.graph.InitialCyclesTest.naphthalene;
 import static org.openscience.cdk.graph.InitialCyclesTest.norbornane;
 
+import org.junit.Test;
+
 /**
  * @author John May
  * @cdk.module test-core