[Jmol-commits] SF.net SVN: jmol:[12672] trunk/Jmol/src/org/jmol/script/ScriptEvaluator. java

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

Revision: 12672
          http://jmol.svn.sourceforge.net/jmol/?rev=12672&view=rev
Author:   hansonr
Date:     2010-03-22 16:15:54 +0000 (Mon, 22 Mar 2010)

Log Message:
-----------
version=11.9.36_dev # bug fix: show symop  by itself AFTER show symop n does not show full list

Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java

Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java
===================================================================
--- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java	2010-03-22 15:16:53 UTC (rev 12671)
+++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java	2010-03-22 16:15:54 UTC (rev 12672)
@@ -11646,16 +11646,8 @@
       if (token != null)
         tok = token.tok;
     }
-    if (tok == Token.symop && statementLength > 3) {
-      Point3f pt1 = centerParameter(2);
-      Point3f pt2 = centerParameter(++iToken);
-      if (isSyntaxCheck)
-        return;
-      len = ++iToken;
-      msg = viewer.getSymmetryOperation(null, 0, pt1, pt2);
-    } else {
+    if (tok != Token.symop || statementLength <= 3)
       checkLength(-3);
-    }
     if (statementLength == 2 && str.indexOf("?") >= 0) {
       showString(viewer.getAllSettings(str.substring(0, str.indexOf("?"))));
       return;
@@ -11665,7 +11657,13 @@
       msg = Escape.escape(((ScriptVariable)theToken).value);
       break;
     case Token.symop:
-      if (msg == null) {
+      if (statementLength > 3) {
+        Point3f pt1 = centerParameter(2);
+        Point3f pt2 = centerParameter(++iToken);
+        if (!isSyntaxCheck)
+          msg = viewer.getSymmetryOperation(null, 0, pt1, pt2);
+        len = ++iToken;
+      } else {
         int iop = (checkLength23() == 2 ? 0 : intParameter(2));
         if (!isSyntaxCheck)
           msg = viewer.getSymmetryOperation(null, iop, null, null);


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