[Jmol-commits] CVS: Jmol/src JmolApplet.java,1.48,1.49

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

Update of /cvsroot/jmol/Jmol/src
In directory sc8-pr-cvs1:/tmp/cvs-serv28916/src

Modified Files:
	JmolApplet.java 
Log Message:
tweaks to JmolApplet


Index: JmolApplet.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/JmolApplet.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- JmolApplet.java	7 Oct 2003 09:55:37 -0000	1.48
+++ JmolApplet.java	11 Oct 2003 09:27:02 -0000	1.49
@@ -58,8 +58,6 @@
   String pauseCallback;
   String pickCallback;
 
-  private String defaultAtomTypesFileName = "Data/AtomTypes.txt";
-
   public String getAppletInfo() {
     return appletInfo;
   }
@@ -67,6 +65,8 @@
     "Jmol Applet.  Part of the OpenScience project. " +
     "See jmol.sourceforge.net for more information";
 
+  /*
+
   private static String[][] paramInfo = {
     { "bgcolor", "color",
       "Background color to HTML color name or #RRGGBB" },
@@ -90,10 +90,12 @@
     return paramInfo;
   }
 
+  */
 
   public void init() {
     htmlName = getParameter("name");
-    mayScript = getParameter("mayscript") != null;
+    String ms = getParameter("mayscript");
+    mayScript = (ms != null) && (! ms.equalsIgnoreCase("false"));
     appletRegistry = new JmolAppletRegistry(htmlName, mayScript, this);
 
     loadProperties();
@@ -108,10 +110,6 @@
     viewer = new JmolViewer(this, new SimpleModelAdapter());
     viewer.setJmolStatusListener(this);
 
-    if (! (viewer.strOSName.equals("Mac OS") &&
-           viewer.strJavaVersion.equals("1.1.5")))
-      jmolpopup = new JmolPopup(viewer, this);
-
     viewer.setAppletContext(getDocumentBase(), getCodeBase(),
                             getValue("JmolAppletProxy", null));
 
@@ -134,7 +132,8 @@
     URL codeBase = getCodeBase();
     try {
       URL urlProperties = new URL(codeBase, "JmolApplet.properties");
-      appletProperties = new PropertyResourceBundle(urlProperties.openStream());
+      appletProperties =
+        new PropertyResourceBundle(urlProperties.openStream());
     } catch (Exception ex) {
       System.out.println("JmolApplet.loadProperties() -> " + ex);
     }
@@ -160,7 +159,8 @@
       try {
         return Integer.parseInt(stringValue);
       } catch (NumberFormatException ex) {
-        System.out.println(propertyName + ":" + stringValue + " is not an integer");
+        System.out.println(propertyName + ":" +
+                           stringValue + " is not an integer");
       }
     return defaultValue;
   }
@@ -171,7 +171,8 @@
       try {
         return (new Double(stringValue)).doubleValue();
       } catch (NumberFormatException ex) {
-        System.out.println(propertyName + ":" + stringValue + " is not an integer");
+        System.out.println(propertyName + ":" +
+                           stringValue + " is not a double");
       }
     return defaultValue;
   }
@@ -222,9 +223,7 @@
            messageCallback != null ||
            pauseCallback != null ||
            pickCallback != null))
-        System.out.println("WARNING!! to use callback function you *must* " +
-                           "declare the MAYSCRIPT attribute in your APPLET " +
-                           "tag in your html code");
+        System.out.println("WARNING!! MAYSCRIPT not found");
 
     }
     viewer.popHoldRepaint();
@@ -270,6 +269,11 @@
   }
 
   public void handlePopupMenu(int x, int y) {
+    if (jmolpopup == null) {
+      if (! (viewer.strOSName.equals("Mac OS") &&
+             viewer.strJavaVersion.equals("1.1.5")))
+        jmolpopup = new JmolPopup(viewer, this);
+    }
     if (jmolpopup != null)
       jmolpopup.show(x, y);
   }
@@ -435,7 +439,8 @@
   }
 
   public void script(String script) {
-    System.out.println(htmlName + " will try to run:\n-----" + script + "\n-----\n");
+    System.out.println(htmlName + " will try to run:\n-----" +
+                       script + "\n-----\n");
     setStatusMessage("Jmol script executing...");
     String strError = viewer.evalString(script);
     setStatusMessage(strError);