[Jmol-commits] CVS: Jmol/src/org/jmol/api JmolViewer.java,1.19,1.20 JmolStatusListener.java,1.9,1.10

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

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

Modified Files:
	JmolViewer.java JmolStatusListener.java 
Log Message:
Trying to organize the applet/app -- StatusManager interface. Several functions renamed, particularly ones that were labeled "notify" -- see the JmolStatusListener interface list, which is now "bare-bones" in terms of what is actually needed. All these functions are functions of StatusManager now, and all diverge at this point as the ONLY status-related differences between app and applet. All status-related methods MUST (please!) go through Viewer, which then sends them on to Viewer.statusManager for final processing. 

Only three actions in StatusManager:

(1) creating and queuing the status messages requested for "callback",

(2) sending messages to the app/applet to handle slightly different actions in picking and console operations, and 

(3) sending messages to the applet for (possible) callback using MAYSCRIPT.

prototype is at http://www.stolaf.edu/people/hansonr/jmol/test/json/callback.htm



Index: JmolViewer.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/jmol/api/JmolViewer.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- JmolViewer.java	11 Feb 2006 20:19:06 -0000	1.19
+++ JmolViewer.java	12 Feb 2006 00:32:59 -0000	1.20
@@ -21,6 +21,7 @@
  *  License along with this library; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+
 package org.jmol.api;
 
 import java.awt.Component;
@@ -81,9 +82,6 @@
   abstract public Image getScreenImage();
   abstract public void releaseScreenImage();
 
-
-  abstract public void notifyRepainted();
-
   abstract public boolean handleOldJvm10Event(Event e);
 
   abstract public int getMotionEventNumber();
@@ -244,11 +242,9 @@
 
   abstract public boolean showModelSetDownload();
   
-  abstract public void setStatusChanged(String statusName, int intInfo, Object statusInfo, boolean isReplace);
+  abstract public void repaintView();
 
   abstract public Object getProperty(String returnType, String infoType, String paramInfo);
   
-
-
 }
 

Index: JmolStatusListener.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/jmol/api/JmolStatusListener.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JmolStatusListener.java	11 Feb 2006 08:21:31 -0000	1.9
+++ JmolStatusListener.java	12 Feb 2006 00:32:59 -0000	1.10
@@ -21,31 +21,41 @@
  *  License along with this library; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+
 package org.jmol.api;
 
 public interface JmolStatusListener {
-  public void notifyFileLoaded(String fullPathName, String fileName,
-                               String modelName, Object clientFile,
-                               String errorMessage);
+/**
+ * 
+ * These methods specoifically provide notification from 
+ * Viewer.StatusManager to the two main classes, applet or app.
+ * so that they can handle them slightly differently. This might be
+ * a callback for the applet, for example, but not for the app.
+ * ALL viewer-type processing, including status queue writing
+ * has been done PRIOR to these functions being called.   Bob Hanson
+ * 
+ */
+  public void handlePopupMenu(int x, int y);
 
-  public void setStatusMessage(String statusMessage);
-  public void setStatusMessage(String statusMessage, String additionalInfo);
-  
-  public void scriptEcho(String strEcho);
+  public void notifyAtomPicked(int atomIndex, String strInfo);
 
-  public void scriptStatus(String strStatus);
+  public void notifyFileLoaded(String fullPathName, String fileName,
+      String modelName, Object clientFile,
+      String errorMessage);
 
-  public void notifyScriptTermination(String statusMessage, int msWalltime);
+  public void notifyFrameChanged(int frameNo);
 
-  public void handlePopupMenu(int x, int y);
+  public void notityNewDefaultModeMeasurement(int count, String strInfo);
 
-  public void notifyMeasurementsChanged(int count, String strInfo);
+  public void notifyNewPickingModeMeasurement(int iatom, String strMeasure);
 
-  public void notifyMeasureSelection(int iatom, String strMeasure);
+  public void notifyScriptStart(String statusMessage, String additionalInfo);
+  
+  public void notifyScriptTermination(String statusMessage, int msWalltime);
 
-  public void notifyFrameChanged(int frameNo);
+  public void sendConsoleEcho(String strEcho);
 
-  public void notifyAtomPicked(int atomIndex, String strInfo);
+  public void sendConsoleMessage(String strStatus);
 
   public void showUrl(String url);