Removed the dependency on the nonotify module

cdk · Jun 23, 2010 · 93e0a22 · 93e0a22
1 parent a9a4aa8
commit 93e0a22
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/src/main/org/openscience/cdk/signature/MoleculeFromSignatureBuilder.java b/src/main/org/openscience/cdk/signature/MoleculeFromSignatureBuilder.java
@@ -27,7 +27,6 @@
 import org.openscience.cdk.interfaces.IAtomContainer;
 import org.openscience.cdk.interfaces.IBond;
 import org.openscience.cdk.interfaces.IChemObjectBuilder;
-import org.openscience.cdk.nonotify.NoNotificationChemObjectBuilder;
 
 import signature.AbstractGraphBuilder;
 
@@ -51,13 +50,6 @@ public class MoleculeFromSignatureBuilder extends AbstractGraphBuilder {
      */
     private IAtomContainer container;
 
-    /**
-     * This default constructor uses a {@link NoNotificationChemObjectBuilder}
-     */
-    public MoleculeFromSignatureBuilder() {
-        this.builder = NoNotificationChemObjectBuilder.getInstance();
-    }
-
     /**
      * Uses the chem object builder for making molecules.
      * 

diff --git a/src/main/org/openscience/cdk/signature/MoleculeSignature.java b/src/main/org/openscience/cdk/signature/MoleculeSignature.java
@@ -27,6 +27,7 @@
 
 import org.openscience.cdk.annotations.TestClass;
 import org.openscience.cdk.interfaces.IAtomContainer;
+import org.openscience.cdk.interfaces.IChemObjectBuilder;
 import org.openscience.cdk.interfaces.IMolecule;
 
 import signature.AbstractGraphSignature;
@@ -121,12 +122,14 @@ public List<Orbit> calculateOrbits() {
      * strings.
      * 
      * @param signatureString the signature string to use
+     * @param coBuilder {@link IChemObjectBuilder} to build the returned atom container from
      * @return an atom container
      */
-    public static IAtomContainer fromSignatureString(String signatureString) {
+    public static IAtomContainer fromSignatureString(String signatureString,
+            IChemObjectBuilder coBuilder) {
         ColoredTree tree = AtomSignature.parse(signatureString);
         MoleculeFromSignatureBuilder builder =
-            new MoleculeFromSignatureBuilder();
+            new MoleculeFromSignatureBuilder(coBuilder);
         builder.makeFromColoredTree(tree);
         return builder.getAtomContainer();
     }

diff --git a/src/test/org/openscience/cdk/signature/MoleculeFromSignatureBuilderTest.java b/src/test/org/openscience/cdk/signature/MoleculeFromSignatureBuilderTest.java
@@ -28,6 +28,7 @@
 import org.openscience.cdk.interfaces.IAtom;
 import org.openscience.cdk.interfaces.IAtomContainer;
 import org.openscience.cdk.interfaces.IBond;
+import org.openscience.cdk.nonotify.NoNotificationChemObjectBuilder;
 
 import signature.AbstractVertexSignature;
 import signature.ColoredTree;
@@ -52,7 +53,7 @@ public String canonicalSignature(IAtomContainer atomContainer) {
     public IAtomContainer reconstruct(String signature) {
         ColoredTree tree = AbstractVertexSignature.parse(signature);
         MoleculeFromSignatureBuilder builder = 
-            new MoleculeFromSignatureBuilder();
+            new MoleculeFromSignatureBuilder(NoNotificationChemObjectBuilder.getInstance());
         builder.makeFromColoredTree(tree);
         return builder.getAtomContainer();
     }