Correct boolean comparison

Change-Id: I0a4f1eb2e97403089d046e5ab2dad22676c98256 Signed-off-by: John May <john.wilkinsonmay@gmail.com>
cdk · May 3, 2013 · 352f1d5 · 352f1d5
1 parent 5753c24
commit 352f1d5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/main/org/openscience/cdk/atomtype/CDKAtomTypeMatcher.java b/src/main/org/openscience/cdk/atomtype/CDKAtomTypeMatcher.java
@@ -1342,7 +1342,7 @@ private IAtomType perceivePhosphors(IAtomContainer atomContainer, IAtom atom)
             }
         } else if (neighborcount == 3) {
         	int doubleBonds = countAttachedDoubleBonds(atomContainer, atom);
-            if (atom.getFormalCharge() != null &
+            if (atom.getFormalCharge() != null &&
                 atom.getFormalCharge().intValue() == 1) {
                 IAtomType type = getAtomType("P.anium");
                 if (isAcceptable(atom, atomContainer, type)) return type;
@@ -1355,7 +1355,7 @@ private IAtomType perceivePhosphors(IAtomContainer atomContainer, IAtom atom)
             }
         } else if (neighborcount == 2) {
             if (maxBondOrder == CDKConstants.BONDORDER_DOUBLE) {
-                if (atom.getFormalCharge() != null &
+                if (atom.getFormalCharge() != null &&
                     atom.getFormalCharge().intValue() == 1) {
                     IAtomType type = getAtomType("P.sp1.plus");
                     if (isAcceptable(atom, atomContainer, type)) return type;

diff --git a/src/main/org/openscience/cdk/atomtype/MM2AtomTypeMatcher.java b/src/main/org/openscience/cdk/atomtype/MM2AtomTypeMatcher.java
@@ -194,7 +194,7 @@ public IAtomType findMatchingAtomType(IAtomContainer atomContainer, IAtom atomIn
 					}
 					p1 = Pattern.compile(getSphericalMatcher("OX"));
 					mat1 = p1.matcher(atomSphericalMatcher);
-					if (mat1.matches() & atomChemicalGroupConstant==-1) {
+					if (mat1.matches() && atomChemicalGroupConstant==-1) {
 						ID="OX";
 					}
 
@@ -216,12 +216,12 @@ public IAtomType findMatchingAtomType(IAtomContainer atomContainer, IAtom atomIn
 						//Amid
 						p1 = Pattern.compile(getSphericalMatcher("Namid"));
 						mat1 = p1.matcher(atomSphericalMatcher);
-						if (mat1.matches() & atomChemicalGroupConstant==-1) {
+						if (mat1.matches() && atomChemicalGroupConstant==-1) {
 							ID="Nsp2";
 						}else{
 							p1 = Pattern.compile(getSphericalMatcher("N2OX"));
 							mat1 = p1.matcher(atomSphericalMatcher);	
-							if (mat1.matches() & atomChemicalGroupConstant==-1) {
+							if (mat1.matches() && atomChemicalGroupConstant==-1) {
 								ID="N2OX";
 							}
 						}
@@ -235,7 +235,7 @@ public IAtomType findMatchingAtomType(IAtomContainer atomContainer, IAtom atomIn
 					//Azo
 					p1 = Pattern.compile(getSphericalMatcher("-N="));
 					mat1 = p1.matcher(atomSphericalMatcher);
-					if (mat1.matches() & atomChemicalGroupConstant==-1) {
+					if (mat1.matches() && atomChemicalGroupConstant==-1) {
 						ID="-N=";
 					}else{
 						p1 = Pattern.compile(getSphericalMatcher("N=C"));
@@ -273,13 +273,13 @@ public IAtomType findMatchingAtomType(IAtomContainer atomContainer, IAtom atomIn
 					//Enol,amid
 					p1 = Pattern.compile(getSphericalMatcher("HOC"));
 					mat1 = p1.matcher(atomSphericalMatcher);
-					if (mat1.matches() & atomChemicalGroupConstant==-1) {
+					if (mat1.matches() && atomChemicalGroupConstant==-1) {
 						ID="HN2";
 					}
 					//COOH
 					p1 = Pattern.compile(getSphericalMatcher("HOCO"));
 					mat1 = p1.matcher(atomSphericalMatcher);
-					if (mat1.matches() & atomChemicalGroupConstant==-1) {
+					if (mat1.matches() && atomChemicalGroupConstant==-1) {
 						ID="HOCO";
 					}
 				} else if (atomTypeIds[j].equals("HN")) {

diff --git a/src/main/org/openscience/cdk/atomtype/MMFF94AtomTypeMatcher.java b/src/main/org/openscience/cdk/atomtype/MMFF94AtomTypeMatcher.java
@@ -199,7 +199,7 @@ public IAtomType findMatchingAtomType(IAtomContainer atomContainer, IAtom atomIn
 					//Amid
 					p1 = Pattern.compile(getSphericalMatcher(atomTypeIds[48]));//NC=0
 					mat1 = p1.matcher(atomSphericalMatcher);
-					if (mat1.matches() & atomChemGroupConstant==-1) {
+					if (mat1.matches() && atomChemGroupConstant==-1) {
 						ID = atomTypeIds[48];//NC=O
 					}
 					//nsp3 oxide