[Cdk-commits] SF.net SVN: cdk: [9030] trunk/cdk/src/org/openscience/cdk/isomorphism/ matchers/smarts/ExplicitConnectionAtom.java

[<raj...@us...>]

Revision: 9030
          http://cdk.svn.sourceforge.net/cdk/?rev=9030&view=rev
Author:   rajarshi
Date:     2007-10-05 15:57:34 -0700 (Fri, 05 Oct 2007)

Log Message:
-----------
Updated to take into account the fact that getHydrogenCount() might return null (UNSET) in which we case assume it's 0

Modified Paths:
--------------
    trunk/cdk/src/org/openscience/cdk/isomorphism/matchers/smarts/ExplicitConnectionAtom.java

Modified: trunk/cdk/src/org/openscience/cdk/isomorphism/matchers/smarts/ExplicitConnectionAtom.java
===================================================================
--- trunk/cdk/src/org/openscience/cdk/isomorphism/matchers/smarts/ExplicitConnectionAtom.java	2007-10-05 22:49:35 UTC (rev 9029)
+++ trunk/cdk/src/org/openscience/cdk/isomorphism/matchers/smarts/ExplicitConnectionAtom.java	2007-10-05 22:57:34 UTC (rev 9030)
@@ -60,13 +60,13 @@
 	/* (non-Javadoc)
 	 * @see org.openscience.cdk.isomorphism.matchers.smarts.SMARTSAtom#matches(org.openscience.cdk.interfaces.IAtom)
 	 */
-	public boolean matches(IAtom atom) {
-		int conn = ((Integer)atom.getProperty(CDKConstants.TOTAL_CONNECTIONS)).intValue() -
-		atom.getHydrogenCount();
-		return numOfConnection == conn;
-	}
+    public boolean matches(IAtom atom) {
+        int ih = atom.getHydrogenCount() == CDKConstants.UNSET ? 0 : atom.getHydrogenCount();
+        int conn = ((Integer) atom.getProperty(CDKConstants.TOTAL_CONNECTIONS)).intValue() - ih;
+        return numOfConnection == conn;
+    }
 
-	/**
+    /**
 	 * Returns number of explicit connections
 	 * 
 	 * @return


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.