[Cdk-commits] CVS: cdk/src/org/openscience/cdk ChemObject.java,1.53,1.54 AtomType.java,1.51,1.52

[Egon W. <eg...@us...>]

Update of /cvsroot/cdk/cdk/src/org/openscience/cdk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29490/src/org/openscience/cdk

Modified Files:
	ChemObject.java AtomType.java 
Log Message:
Test for instanceof interface, instead of implementation.

Index: ChemObject.java
===================================================================
RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/ChemObject.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- ChemObject.java	22 Oct 2005 16:25:51 -0000	1.53
+++ ChemObject.java	5 Dec 2005 22:14:58 -0000	1.54
@@ -304,12 +304,12 @@
 			while (keys.hasMoreElements())
 			{
 				Object key = keys.nextElement();
-				if (key instanceof ChemObject)
+				if (key instanceof org.openscience.cdk.interfaces.ChemObject)
 				{
 					key = ((ChemObject) key).clone();
 				}
 				Object value = properties.get(key);
-				if (value instanceof ChemObject)
+				if (value instanceof org.openscience.cdk.interfaces.ChemObject)
 				{
 					value = ((ChemObject) value).clone();
 				}
@@ -331,7 +331,7 @@
 	 */
 	public boolean compare(Object object)
 	{
-		if (!(object instanceof ChemObject))
+		if (!(object instanceof org.openscience.cdk.interfaces.ChemObject))
 		{
 			return false;
 		}

Index: AtomType.java
===================================================================
RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/AtomType.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- AtomType.java	22 Oct 2005 16:25:51 -0000	1.51
+++ AtomType.java	5 Dec 2005 22:14:58 -0000	1.52
@@ -274,7 +274,7 @@
      * @return        Return true, if the atomtypes are equal
      */
     public boolean compare(Object object) {
-        if (!(object instanceof AtomType)) {
+        if (!(object instanceof org.openscience.cdk.interfaces.AtomType)) {
             return false;
         }
         if (!super.compare(object)) {