[Jmol-commits] CVS: Jmol/src/org/jmol/applet JmolApplet.java,1.2,1.3

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

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

Modified Files:
	JmolApplet.java 
Log Message:
popup now show model set information


Index: JmolApplet.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/jmol/applet/JmolApplet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JmolApplet.java	3 Dec 2004 04:26:02 -0000	1.2
+++ JmolApplet.java	3 Dec 2004 20:33:23 -0000	1.3
@@ -282,17 +282,19 @@
   }
 
   public void notifyFileLoaded(String fullPathName, String fileName,
-                               String modelName, Object clientFile) {
-    if (loadStructCallback != null && jsoWindow != null)
-      jsoWindow.call(loadStructCallback, new Object[] {htmlName});
+                               String modelName, Object clientFile,
+                               String errorMsg) {
+    if (errorMsg != null) {
+      showStatusAndConsole("File Error:" + errorMsg);
+      return;
+    }
+    if (fullPathName != null)
+      if (loadStructCallback != null && jsoWindow != null)
+        jsoWindow.call(loadStructCallback, new Object[] {htmlName});
     if (jmolpopup != null)
       jmolpopup.updateComputedMenus();
   }
 
-  public void notifyFileNotLoaded(String fullPathName, String errorMsg) {
-    showStatusAndConsole("File Error:" + errorMsg);
-  }
-
   public void setStatusMessage(String statusMessage) {
     if (statusMessage == null)
       return;
@@ -352,6 +354,7 @@
   }
 
   public void showUrl(String urlString) {
+    System.out.println("showUrl(" + urlString + ")");
     if (urlString != null && urlString.length() > 0) {
       try {
         URL url = new URL(urlString);