[Jmol-commits] CVS: Jmol/src/org/jmol/appletwrapper WrappedApplet.java,1.6,1.7 AppletWrapper.java,1.9,1.10

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

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

Modified Files:
	WrappedApplet.java AppletWrapper.java 
Log Message:
JavaScript asynchronous/synchronous augmentation

JavaScript asynchronous interface augmented:

 animFrameCallback, loadStructCallback, messageCallback, pickCallback values sent to System.out on startup
 loadStructcallback output improved to include file path
 unimplemented pauseCallback commented out

JavaScript synchronous interface augmented:
 
 (String)getAppletInfo() moved and improved to include version and date; 
 (String)getAppletInfo("fileContents") added
 (String)getAppletInfo("fileContents","<filepath>") added 



Index: WrappedApplet.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/jmol/appletwrapper/WrappedApplet.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- WrappedApplet.java	10 Nov 2005 15:52:39 -0000	1.6
+++ WrappedApplet.java	6 Feb 2006 03:29:46 -0000	1.7
@@ -31,6 +31,8 @@
   public void setAppletWrapper(AppletWrapper appletWrapper);
   public void init();
   public String getAppletInfo();
+  public String getAppletInfo(String infoType);
+  public String getAppletInfo(String infoType, String paramInfo);
   public void update(Graphics g);
   public void paint(Graphics g);
   public boolean handleEvent(Event e);

Index: AppletWrapper.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/jmol/appletwrapper/AppletWrapper.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AppletWrapper.java	10 Nov 2005 15:52:39 -0000	1.9
+++ AppletWrapper.java	6 Feb 2006 03:29:46 -0000	1.10
@@ -83,9 +83,11 @@
     needToCompleteInitialization = true;
   }
 
+/* moved to Jmol.java  BH 2/5/06
   public String getAppletInfo() {
     return (wrappedApplet != null ? wrappedApplet.getAppletInfo() : null);
   }
+*/
 
   public void init() {
     startTime = System.currentTimeMillis();