[Jmol-commits] CVS: Jmol/src JmolApplet.java,1.112,1.113

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

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

Modified Files:
	JmolApplet.java 
Log Message:
Split out AppletWrapper from JmolAppletInterface


Index: JmolApplet.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/JmolApplet.java,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- JmolApplet.java	23 Dec 2004 23:34:28 -0000	1.112
+++ JmolApplet.java	29 Dec 2004 22:54:07 -0000	1.113
@@ -31,6 +31,10 @@
  * see org.jmol.applet.JmolApplet
  *
  */
+
+import org.jmol.api.JmolAppletInterface;
+import netscape.javascript.JSObject;
+
 public class JmolApplet extends org.jmol.appletwrapper.AppletWrapper {
 
   public JmolApplet() {
@@ -42,15 +46,38 @@
 
   private final static String[] preloadClasses = {
     "javax.vecmath.Point3f+",
-    ".Vector3f+", ".Matrix3f+", ".Point3i+",
-
     "org.jmol.g3d.Graphics3D",
-    ".Sphere3D", ".Line3D", ".Cylinder3D", ".Colix", ".Shade3D",
-
     "org.jmol.adapter.smarter.SmarterJmolAdapter",
-    ".Atom", ".Bond", ".AtomSetCollection", ".AtomSetCollectionReader",
+    "org.openscience.jmol.ui.JmolPopup",
+
+    "javax.vecmath.Vector3f+",
+    ".Matrix3f+", ".Point3i+",
+
+    "org.jmol.g3d.Sphere3D",
+    ".Line3D", ".Cylinder3D", ".Colix", ".Shade3D",
+
+    "org.jmol.adapter.smarter.Atom",
+    ".Bond", ".AtomSetCollection", ".AtomSetCollectionReader",
     ".Resolver",
 
-    "org.openscience.jmol.ui.JmolPopup",
   };
+
+  public void script(String script) {
+    if (wrappedApplet != null)
+      ((JmolAppletInterface)wrappedApplet).script(script);
+  }
+  
+  public void loadInline(String strModel) {
+    if (wrappedApplet != null)
+      ((JmolAppletInterface)wrappedApplet).loadInline(strModel);
+  }
+
+  public void scriptButton(JSObject buttonWindow, String buttonName,
+                           String script, String buttonCallback) {
+    if (wrappedApplet != null)
+      ((JmolAppletInterface)wrappedApplet).scriptButton(buttonWindow,
+                                                        buttonName,
+                                                        script,
+                                                        buttonCallback);
+  }
 }