[Jmol-commits] CVS: Jmol/src/org/jmol/adapter/smarter Resolver.java,1.7,1.8 FoldingXyzReader.java,1.2,1.3

[Nicolas <ni...@us...>]

Update of /cvsroot/jmol/Jmol/src/org/jmol/adapter/smarter
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15882/src/org/jmol/adapter/smarter

Modified Files:
	Resolver.java FoldingXyzReader.java 
Log Message:
Fixed problems with 1.1 jvms

Index: Resolver.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/jmol/adapter/smarter/Resolver.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Resolver.java	24 Jan 2005 19:42:22 -0000	1.7
+++ Resolver.java	25 Jan 2005 22:11:16 -0000	1.8
@@ -28,6 +28,7 @@
 import org.jmol.api.JmolAdapter;
 
 import java.io.BufferedReader;
+import java.util.StringTokenizer;
 
 class Resolver {
 
@@ -87,9 +88,9 @@
     } catch (NumberFormatException e) {
     }
     try {
-      String[] elements = lines[0].trim().split("[ \t]+");
-      if (elements.length >= 2) {
-        Integer.parseInt(elements[0].trim());
+      StringTokenizer tokens = new StringTokenizer(lines[0].trim(), " \t");
+      if ((tokens != null) && (tokens.countTokens() >= 2)) {
+        Integer.parseInt(tokens.nextToken().trim());
         return "FoldingXyz";
       }
     } catch (NumberFormatException e) {

Index: FoldingXyzReader.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/jmol/adapter/smarter/FoldingXyzReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FoldingXyzReader.java	24 Jan 2005 19:42:17 -0000	1.2
+++ FoldingXyzReader.java	25 Jan 2005 22:11:18 -0000	1.3
@@ -26,6 +26,7 @@
 package org.jmol.adapter.smarter;
 
 import java.io.BufferedReader;
+import java.util.StringTokenizer;
 
 /**
  * This reader is for current.xyz files generated by Folding@Home project
@@ -43,12 +44,12 @@
     atomSetCollection = new AtomSetCollection("Folding@Home");
 
     try {
-      String[] elements = reader.readLine().trim().split("[ \t]+");
-      if (elements.length > 0) {
-      	int modelAtomCount = Integer.parseInt(elements[0]);
+      StringTokenizer tokens = new StringTokenizer(reader.readLine(), " \t");
+      if (tokens.hasMoreTokens()) {
+      	int modelAtomCount = Integer.parseInt(tokens.nextToken());
       	atomSetCollection.newAtomSet();
-      	if (elements.length > 1) {
-      		atomSetCollection.setAtomSetName("Protein " + elements[1]);
+      	if (tokens.hasMoreTokens()) {
+      		atomSetCollection.setAtomSetName("Protein " + tokens.nextToken());
       	}
       	readAtoms(reader, modelAtomCount);
       }
@@ -69,7 +70,7 @@
       	line = reader.readLine();
       }
       if (line != null) {
-	    System.out.println("Line: " + line);
+	    //System.out.println("Line: " + line);
 	    Atom atom = atomSetCollection.addNewAtom();
 	    parseInt(line);
 	    atom.atomName = parseToken(line, ichNextParse);