moving stereo factories

Signed-off-by: Egon Willighagen <egonw@users.sourceforge.net>
cdk · Jun 8, 2013 · 556d84a · 556d84a
1 parent de51403
commit 556d84a
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 34 deletions.
diff --git a/src/main/org/openscience/cdk/hash/BasicAtomHashGenerator.java b/src/main/org/openscience/cdk/hash/BasicAtomHashGenerator.java
@@ -27,7 +27,7 @@
 import org.openscience.cdk.annotations.TestClass;
 import org.openscience.cdk.annotations.TestMethod;
 import org.openscience.cdk.hash.stereo.StereoEncoder;
-import org.openscience.cdk.hash.stereo.factory.StereoEncoderFactory;
+import org.openscience.cdk.hash.stereo.StereoEncoderFactory;
 import org.openscience.cdk.interfaces.IAtomContainer;
 
 /**

diff --git a/src/main/org/openscience/cdk/hash/HashGeneratorMaker.java b/src/main/org/openscience/cdk/hash/HashGeneratorMaker.java
@@ -27,10 +27,10 @@
 import org.openscience.cdk.annotations.TestClass;
 import org.openscience.cdk.annotations.TestMethod;
 import org.openscience.cdk.hash.stereo.StereoEncoder;
-import org.openscience.cdk.hash.stereo.factory.GeometricCumulativeDoubleBondFactory;
-import org.openscience.cdk.hash.stereo.factory.GeometricDoubleBondEncoderFactory;
-import org.openscience.cdk.hash.stereo.factory.GeometricTetrahedralEncoderFactory;
-import org.openscience.cdk.hash.stereo.factory.StereoEncoderFactory;
+import org.openscience.cdk.hash.stereo.GeometricCumulativeDoubleBondFactory;
+import org.openscience.cdk.hash.stereo.GeometricDoubleBondEncoderFactory;
+import org.openscience.cdk.hash.stereo.GeometricTetrahedralEncoderFactory;
+import org.openscience.cdk.hash.stereo.StereoEncoderFactory;
 import org.openscience.cdk.interfaces.IAtomContainer;
 
 import java.util.ArrayList;

diff --git a/src/main/org/openscience/cdk/hash/PerturbedAtomHashGenerator.java b/src/main/org/openscience/cdk/hash/PerturbedAtomHashGenerator.java
@@ -27,7 +27,7 @@
 import org.openscience.cdk.annotations.TestClass;
 import org.openscience.cdk.annotations.TestMethod;
 import org.openscience.cdk.hash.stereo.StereoEncoder;
-import org.openscience.cdk.hash.stereo.factory.StereoEncoderFactory;
+import org.openscience.cdk.hash.stereo.StereoEncoderFactory;
 import org.openscience.cdk.interfaces.IAtomContainer;
 
 import java.util.Arrays;

diff --git a/...GeometricCumulativeDoubleBondFactory.java → ...GeometricCumulativeDoubleBondFactory.java b/...GeometricCumulativeDoubleBondFactory.java → ...GeometricCumulativeDoubleBondFactory.java
@@ -21,13 +21,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U
  */
 
-package org.openscience.cdk.hash.stereo.factory;
+package org.openscience.cdk.hash.stereo;
 
 import org.openscience.cdk.annotations.TestClass;
 import org.openscience.cdk.annotations.TestMethod;
-import org.openscience.cdk.hash.stereo.GeometryEncoder;
-import org.openscience.cdk.hash.stereo.MultiStereoEncoder;
-import org.openscience.cdk.hash.stereo.StereoEncoder;
 import org.openscience.cdk.hash.stereo.parity.BasicPermutationParity;
 import org.openscience.cdk.hash.stereo.parity.CombinedPermutationParity;
 import org.openscience.cdk.hash.stereo.parity.GeometricParity;
@@ -54,7 +51,7 @@
  * @author John May
  * @cdk.module hash
  */
-@TestClass("org.openscience.cdk.hash.stereo.factory.GeometricCumulativeDoubleBondFactoryTest")
+@TestClass("org.openscience.cdk.hash.stereo.GeometricCumulativeDoubleBondFactoryTest")
 public class GeometricCumulativeDoubleBondFactory
         implements StereoEncoderFactory {
 

diff --git a/...ry/GeometricDoubleBondEncoderFactory.java → ...eo/GeometricDoubleBondEncoderFactory.java b/...ry/GeometricDoubleBondEncoderFactory.java → ...eo/GeometricDoubleBondEncoderFactory.java
@@ -22,13 +22,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U
  */
 
-package org.openscience.cdk.hash.stereo.factory;
+package org.openscience.cdk.hash.stereo;
 
 import org.openscience.cdk.annotations.TestClass;
 import org.openscience.cdk.annotations.TestMethod;
-import org.openscience.cdk.hash.stereo.GeometryEncoder;
-import org.openscience.cdk.hash.stereo.MultiStereoEncoder;
-import org.openscience.cdk.hash.stereo.StereoEncoder;
 import org.openscience.cdk.hash.stereo.parity.BasicPermutationParity;
 import org.openscience.cdk.hash.stereo.parity.CombinedPermutationParity;
 import org.openscience.cdk.hash.stereo.parity.DoubleBond2DParity;
@@ -64,7 +61,7 @@
  * @cdk.githash
  * @see org.openscience.cdk.hash.HashGeneratorMaker
  */
-@TestClass("org.openscience.cdk.hash.stereo.factory.GeometricDoubleBondEncoderFactoryTest")
+@TestClass("org.openscience.cdk.hash.stereo.GeometricDoubleBondEncoderFactoryTest")
 public final class GeometricDoubleBondEncoderFactory
         implements StereoEncoderFactory {
 

diff --git a/...y/GeometricTetrahedralEncoderFactory.java → ...o/GeometricTetrahedralEncoderFactory.java b/...y/GeometricTetrahedralEncoderFactory.java → ...o/GeometricTetrahedralEncoderFactory.java
@@ -22,13 +22,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U
  */
 
-package org.openscience.cdk.hash.stereo.factory;
+package org.openscience.cdk.hash.stereo;
 
 import org.openscience.cdk.annotations.TestClass;
 import org.openscience.cdk.annotations.TestMethod;
-import org.openscience.cdk.hash.stereo.GeometryEncoder;
-import org.openscience.cdk.hash.stereo.MultiStereoEncoder;
-import org.openscience.cdk.hash.stereo.StereoEncoder;
 import org.openscience.cdk.hash.stereo.parity.BasicPermutationParity;
 import org.openscience.cdk.hash.stereo.parity.GeometricParity;
 import org.openscience.cdk.hash.stereo.parity.Tetrahedral2DParity;
@@ -58,7 +55,7 @@
  * @cdk.module hash
  * @cdk.githash
  */
-@TestClass("org.openscience.cdk.hash.stereo.factory.GeometricTetrahedralEncoderFactoryTest")
+@TestClass("org.openscience.cdk.hash.stereo.GeometricTetrahedralEncoderFactoryTest")
 public class GeometricTetrahedralEncoderFactory
         implements StereoEncoderFactory {
 

diff --git a/.../stereo/factory/StereoEncoderFactory.java → ...cdk/hash/stereo/StereoEncoderFactory.java b/.../stereo/factory/StereoEncoderFactory.java → ...cdk/hash/stereo/StereoEncoderFactory.java
@@ -22,9 +22,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U
  */
 
-package org.openscience.cdk.hash.stereo.factory;
+package org.openscience.cdk.hash.stereo;
 
-import org.openscience.cdk.hash.stereo.StereoEncoder;
 import org.openscience.cdk.interfaces.IAtomContainer;
 
 /**

diff --git a/src/test/org/openscience/cdk/hash/HashGeneratorMakerTest.java b/src/test/org/openscience/cdk/hash/HashGeneratorMakerTest.java
@@ -26,7 +26,7 @@
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.openscience.cdk.hash.stereo.factory.StereoEncoderFactory;
+import org.openscience.cdk.hash.stereo.StereoEncoderFactory;
 
 import java.lang.reflect.Field;
 import java.util.Collections;

diff --git a/src/test/org/openscience/cdk/hash/PerturbedAtomHashGeneratorTest.java b/src/test/org/openscience/cdk/hash/PerturbedAtomHashGeneratorTest.java
@@ -29,7 +29,7 @@
 import org.openscience.cdk.Atom;
 import org.openscience.cdk.AtomContainer;
 import org.openscience.cdk.Bond;
-import org.openscience.cdk.hash.stereo.factory.StereoEncoderFactory;
+import org.openscience.cdk.hash.stereo.StereoEncoderFactory;
 import org.openscience.cdk.interfaces.IAtom;
 import org.openscience.cdk.interfaces.IAtomContainer;
 import org.openscience.cdk.interfaces.IBond;

diff --git a/...etricCumulativeDoubleBondFactoryTest.java → ...etricCumulativeDoubleBondFactoryTest.java b/...etricCumulativeDoubleBondFactoryTest.java → ...etricCumulativeDoubleBondFactoryTest.java
@@ -21,14 +21,16 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U
  */
 
-package org.openscience.cdk.hash.stereo.factory;
+package org.openscience.cdk.hash.stereo;
 
 import org.junit.Test;
 import org.openscience.cdk.Atom;
 import org.openscience.cdk.AtomContainer;
 import org.openscience.cdk.Bond;
+import org.openscience.cdk.hash.stereo.GeometricCumulativeDoubleBondFactory;
 import org.openscience.cdk.hash.stereo.MultiStereoEncoder;
 import org.openscience.cdk.hash.stereo.StereoEncoder;
+import org.openscience.cdk.hash.stereo.StereoEncoderFactory;
 import org.openscience.cdk.interfaces.IAtom;
 import org.openscience.cdk.interfaces.IAtomContainer;
 import org.openscience.cdk.interfaces.IBond;

diff --git a/...eometricDoubleBondEncoderFactoryTest.java → ...eometricDoubleBondEncoderFactoryTest.java b/...eometricDoubleBondEncoderFactoryTest.java → ...eometricDoubleBondEncoderFactoryTest.java
@@ -22,11 +22,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U
  */
 
-package org.openscience.cdk.hash.stereo.factory;
+package org.openscience.cdk.hash.stereo;
 
 import org.junit.Test;
+import org.openscience.cdk.hash.stereo.GeometricDoubleBondEncoderFactory;
 import org.openscience.cdk.hash.stereo.MultiStereoEncoder;
 import org.openscience.cdk.hash.stereo.StereoEncoder;
+import org.openscience.cdk.hash.stereo.StereoEncoderFactory;
 import org.openscience.cdk.hash.stereo.parity.BasicPermutationParity;
 import org.openscience.cdk.hash.stereo.parity.DoubleBond2DParity;
 import org.openscience.cdk.hash.stereo.parity.DoubleBond3DParity;
@@ -50,9 +52,9 @@
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import static org.openscience.cdk.hash.stereo.factory.GeometricDoubleBondEncoderFactory.geometric;
-import static org.openscience.cdk.hash.stereo.factory.GeometricDoubleBondEncoderFactory.moveToBack;
-import static org.openscience.cdk.hash.stereo.factory.GeometricDoubleBondEncoderFactory.permutation;
+import static org.openscience.cdk.hash.stereo.GeometricDoubleBondEncoderFactory.geometric;
+import static org.openscience.cdk.hash.stereo.GeometricDoubleBondEncoderFactory.moveToBack;
+import static org.openscience.cdk.hash.stereo.GeometricDoubleBondEncoderFactory.permutation;
 
 /**
  * @author John May

diff --git a/...ometricTetrahedralEncoderFactoryTest.java → ...ometricTetrahedralEncoderFactoryTest.java b/...ometricTetrahedralEncoderFactoryTest.java → ...ometricTetrahedralEncoderFactoryTest.java
@@ -22,10 +22,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U
  */
 
-package org.openscience.cdk.hash.stereo.factory;
+package org.openscience.cdk.hash.stereo;
 
 import org.hamcrest.CoreMatchers;
 import org.junit.Test;
+import org.openscience.cdk.hash.stereo.GeometricTetrahedralEncoderFactory;
 import org.openscience.cdk.hash.stereo.GeometryEncoder;
 import org.openscience.cdk.hash.stereo.MultiStereoEncoder;
 import org.openscience.cdk.hash.stereo.StereoEncoder;

diff --git a/src/test/org/openscience/cdk/modulesuites/MhashTests.java b/src/test/org/openscience/cdk/modulesuites/MhashTests.java
@@ -35,9 +35,9 @@
 import org.openscience.cdk.hash.stereo.BasicPermutationParityTest;
 import org.openscience.cdk.hash.stereo.GeometryEncoderTest;
 import org.openscience.cdk.hash.stereo.MultiStereoEncoderTest;
-import org.openscience.cdk.hash.stereo.factory.GeometricCumulativeDoubleBondFactoryTest;
-import org.openscience.cdk.hash.stereo.factory.GeometricDoubleBondEncoderFactoryTest;
-import org.openscience.cdk.hash.stereo.factory.GeometricTetrahedralEncoderFactoryTest;
+import org.openscience.cdk.hash.stereo.GeometricCumulativeDoubleBondFactoryTest;
+import org.openscience.cdk.hash.stereo.GeometricDoubleBondEncoderFactoryTest;
+import org.openscience.cdk.hash.stereo.GeometricTetrahedralEncoderFactoryTest;
 import org.openscience.cdk.hash.stereo.parity.CombinedPermutationParityTest;
 import org.openscience.cdk.hash.stereo.parity.DoubleBond2DParityTest;
 import org.openscience.cdk.hash.stereo.parity.DoubleBond3DParityTest;