[Cdk-commits] CVS: cdk/src/org/openscience/cdk/qsar DescriptorEngine.java,1.29,1.30

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

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

Modified Files:
	DescriptorEngine.java 
Log Message:
Argghh... more String.contains from Java5.0.

Index: DescriptorEngine.java
===================================================================
RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/qsar/DescriptorEngine.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- DescriptorEngine.java	22 Jan 2006 10:22:20 -0000	1.29
+++ DescriptorEngine.java	22 Jan 2006 10:51:02 -0000	1.30
@@ -252,7 +252,8 @@
                 for (int i = 0; i < classifications.size(); i++) {
                     Element e = classifications.get(i);
                     Attribute attr = e.getAttribute("resource", rdfNS);
-                    if (attr.getValue().contains("molecularDescriptor") || attr.getValue().contains("atomicDescriptor")) {
+                    if ((attr.getValue().indexOf("molecularDescriptor") != -1) && 
+                        (attr.getValue().indexOf("atomicDescriptor") != -1)) {
                         continue;
                     }
                     String[] tmp = attr.getValue().split("#");