Fixed accepts() methods to also properly accept interfaces, fixing 7 …

…testAcceptsAtLeastOneChemObjectClass() unit tests Change-Id: I611203e6c33a4609e95c191bd5fbd924868ebf3f Signed-off-by: John May <john.wilkinsonmay@gmail.com>
cdk · Dec 12, 2012 · 1463387 · 1463387
1 parent 962e33b
commit 1463387
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 2 deletions.
diff --git a/src/main/org/openscience/cdk/io/CDKSourceCodeWriter.java b/src/main/org/openscience/cdk/io/CDKSourceCodeWriter.java
@@ -133,6 +133,7 @@ public boolean accepts(Class classObject) {
 		for (int i=0; i<interfaces.length; i++) {
 			if (IAtomContainer.class.equals(interfaces[i])) return true;
 		}
+		if (IAtomContainer.class.equals(classObject)) return true;
     Class superClass = classObject.getSuperclass();
     if (superClass != null) return this.accepts(superClass);
 		return false;

diff --git a/src/main/org/openscience/cdk/io/MDLV2000Reader.java b/src/main/org/openscience/cdk/io/MDLV2000Reader.java
@@ -172,8 +172,10 @@ public boolean accepts(Class<? extends IChemObject> classObject) {
 			if (IChemFile.class.equals(interfaces[i])) return true;
 			if (IChemModel.class.equals(interfaces[i])) return true;
 			if (IAtomContainer.class.equals(interfaces[i])) return true;
-			if (IAtomContainer.class.equals(interfaces[i])) return true;
 		}
+		if (IAtomContainer.class.equals(classObject)) return true;
+		if (IChemFile.class.equals(classObject)) return true;
+		if (IChemModel.class.equals(classObject)) return true;
     Class superClass = classObject.getSuperclass();
     if (superClass != null) return this.accepts(superClass);
 		return false;

diff --git a/src/main/org/openscience/cdk/io/MDLV2000Writer.java b/src/main/org/openscience/cdk/io/MDLV2000Writer.java
@@ -181,6 +181,9 @@ public boolean accepts(Class classObject) {
 			if (IChemFile.class.equals(interfaces[i])) return true;
 			if (IChemModel.class.equals(interfaces[i])) return true;
 		}
+		if (IAtomContainer.class.equals(classObject)) return true;
+		if (IChemFile.class.equals(classObject)) return true;
+		if (IChemModel.class.equals(classObject)) return true;
 	    Class superClass = classObject.getSuperclass();
 	    if (superClass != null) return this.accepts(superClass);
 		return false;

diff --git a/src/main/org/openscience/cdk/io/MDLV3000Reader.java b/src/main/org/openscience/cdk/io/MDLV3000Reader.java
@@ -128,8 +128,8 @@ public boolean accepts(Class classObject) {
 		Class[] interfaces = classObject.getInterfaces();
 		for (int i=0; i<interfaces.length; i++) {
 			if (IAtomContainer.class.equals(interfaces[i])) return true;
-			if (IAtomContainer.class.equals(interfaces[i])) return true;
 		}
+		if (IAtomContainer.class.equals(classObject)) return true;
     Class superClass = classObject.getSuperclass();
     if (superClass != null) return this.accepts(superClass);
 		return false;

diff --git a/src/main/org/openscience/cdk/io/Mopac7Reader.java b/src/main/org/openscience/cdk/io/Mopac7Reader.java
@@ -296,6 +296,7 @@ public boolean accepts(Class classObject) {
 		for (int i=0; i<interfaces.length; i++) {
 			if (IAtomContainer.class.equals(interfaces[i])) return true;
 		}
+		if (IAtomContainer.class.equals(classObject)) return true;
 	    Class superClass = classObject.getSuperclass();
 	    if (superClass != null) return this.accepts(superClass);
 		return false;

diff --git a/src/main/org/openscience/cdk/io/SDFWriter.java b/src/main/org/openscience/cdk/io/SDFWriter.java
@@ -135,6 +135,10 @@ public boolean accepts(Class classObject) {
 			if (IChemModel.class.equals(interfaces[i])) return true;
 			if (IAtomContainerSet.class.equals(interfaces[i])) return true;
 		}
+		if (IAtomContainer.class.equals(classObject)) return true;
+		if (IChemFile.class.equals(classObject)) return true;
+		if (IChemModel.class.equals(classObject)) return true;
+		if (IAtomContainerSet.class.equals(classObject)) return true;
 	    Class superClass = classObject.getSuperclass();
 	    if (superClass != null) return this.accepts(superClass);
 		return false;

diff --git a/src/main/org/openscience/cdk/io/program/Mopac7Writer.java b/src/main/org/openscience/cdk/io/program/Mopac7Writer.java
@@ -174,6 +174,7 @@ public boolean accepts(Class classObject) {
 		for (int i=0; i<interfaces.length; i++) {
 			if (IAtomContainer.class.equals(interfaces[i])) return true;
 		}
+		if (IAtomContainer.class.equals(classObject)) return true;
 	    Class superClass = classObject.getSuperclass();
 	    if (superClass != null) return this.accepts(superClass);
 		return false;