[Jmol-commits] CVS: Jmol/src/org/openscience/jmol/viewer/script Eval.java,1.83,1.84

[Michael T H. <mic...@us...>]

Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/script
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10036/src/org/openscience/jmol/viewer/script

Modified Files:
	Eval.java 
Log Message:
eliminated Shape.show!


Index: Eval.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/script/Eval.java,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- Eval.java	18 Feb 2004 18:00:05 -0000	1.83
+++ Eval.java	18 Feb 2004 19:14:45 -0000	1.84
@@ -1875,25 +1875,24 @@
   }
 
   void dots() throws ScriptException {
-    boolean dotsOn = true;
+    short mad = 0;
     switch (statement[1].tok) {
     case Token.on:
+      mad = -1;
       break;
     case Token.off:
-      dotsOn = false;
       break;
     case Token.integer:
       int dotsParam = statement[1].intValue;
       if (dotsParam < 0 || dotsParam > 1000)
         numberOutOfRange();
       // I don't know what to do with this thing yet
-      if (dotsParam == 0)
-        dotsOn = false;
+      mad = (short)dotsParam;
       break;
     default:
       booleanOrNumberExpected();
     }
-    viewer.setShapeShow(JmolConstants.SHAPE_DOTS, dotsOn);
+    viewer.setShapeMad(JmolConstants.SHAPE_DOTS, mad);
   }
 
   void proteinGraphic(int graphicType) throws ScriptException {
@@ -2271,10 +2270,6 @@
     viewer.setScaleAngstromsPerInch(angstromsPerInch);
   }
 
-  void setShapeShow(int graphic) throws ScriptException {
-    viewer.setShapeShow(graphic, getSetBoolean());
-  }
-
   /****************************************************************
    * SHOW implementations
    ****************************************************************/