[Jmol-commits] CVS: Jmol/src/org/jmol/viewer/script Eval.java,1.8,1.9

[Miguel <mig...@us...>]

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

Modified Files:
	Eval.java 
Log Message:
added evalStringQuiet


Index: Eval.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/jmol/viewer/script/Eval.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Eval.java	4 Nov 2004 13:35:19 -0000	1.8
+++ Eval.java	5 Nov 2004 14:22:20 -0000	1.9
@@ -75,6 +75,7 @@
   Thread myThread;
   boolean terminationNotification;
   boolean interruptExecution;
+  boolean tQuiet;
 
   final static boolean logMessages = false;
 
@@ -143,7 +144,7 @@
     return true;
   }
 
-  void clearState() {
+  void clearState(boolean tQuiet) {
     for (int i = scriptLevelMax; --i >= 0; )
       stack[i] = null;
     scriptLevel = 0;
@@ -151,15 +152,16 @@
     errorMessage = null;
     terminationNotification = false;
     interruptExecution = false;
+    this.tQuiet = tQuiet;
   }
 
-  public boolean loadScriptString(String script) {
-    clearState();
+  public boolean loadScriptString(String script, boolean tQuiet) {
+    clearState(tQuiet);
     return loadScript(null, script);
   }
 
-  public boolean loadScriptFile(String filename) {
-    clearState();
+  public boolean loadScriptFile(String filename, boolean tQuiet) {
+    clearState(tQuiet);
     return loadScriptFileInternal(filename);
   }
 
@@ -298,8 +300,10 @@
     timeEndExecution = System.currentTimeMillis();
     if (errorMessage == null && interruptExecution)
       errorMessage = "execution interrupted";
-    viewer.scriptStatus(errorMessage != null
-                        ? errorMessage : "Script completed");
+    if (errorMessage != null)
+      viewer.scriptStatus(errorMessage);
+    else if (! tQuiet)
+      viewer.scriptStatus("Script completed");
     clearMyThread();
     terminationNotification = true;
     viewer.popHoldRepaint();
@@ -2957,7 +2961,6 @@
   void showString(String str) {
     System.out.println("show:" + str);
     viewer.scriptStatus(str);
-    
   }
 
   void showPdbHeader() {