[Jmol-commits] SF.net SVN: jmol: [5133] branches/bob200603/Jmol/src/org/jmol/adapter/smarter/CifReader.java

[<ha...@us...>]

Revision: 5133
Author:   hansonr
Date:     2006-05-17 06:46:25 -0700 (Wed, 17 May 2006)
ViewCVS:  http://svn.sourceforge.net/jmol/?rev=5133&view=rev

Log Message:
-----------
bob200603 10.x.01 CifReader logic correction

Modified Paths:
--------------
    branches/bob200603/Jmol/src/org/jmol/adapter/smarter/CifReader.java
Modified: branches/bob200603/Jmol/src/org/jmol/adapter/smarter/CifReader.java
===================================================================
--- branches/bob200603/Jmol/src/org/jmol/adapter/smarter/CifReader.java	2006-05-17 13:26:30 UTC (rev 5132)
+++ branches/bob200603/Jmol/src/org/jmol/adapter/smarter/CifReader.java	2006-05-17 13:46:25 UTC (rev 5133)
@@ -272,12 +272,12 @@
     // skip everything until empty line, or comment line
     // or start of a new loop_ or data_
     char ch;
-    while (line != null && (line = line.trim()).length() > 0
-        && (ch = line.charAt(0)) != '_' && ch != '#'
-        && !line.startsWith("loop_") && !line.startsWith("data_")
-        || line.length() == 0) {
-      //      logger.log("skipLoopData just discarded:" + line);
-      line = reader.readLine();
+    while (line != null) {
+      line = line.trim();
+      if (line.length() != 0 && ((ch = line.charAt(0)) == '_' || ch == '#'
+          || line.startsWith("loop_") || line.startsWith("data_")))
+          break;
+        line = reader.readLine();
     }
   }
 


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