[Jmol-commits] SF.net SVN: jmol:[9920] trunk/Jmol/src/org

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

Revision: 9920
          http://jmol.svn.sourceforge.net/jmol/?rev=9920&view=rev
Author:   hansonr
Date:     2008-09-22 10:37:58 +0000 (Mon, 22 Sep 2008)

Log Message:
-----------
code

Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/api/JmolStatusListener.java
    trunk/Jmol/src/org/jmol/applet/Jmol.java
    trunk/Jmol/src/org/jmol/applet/Jvm12.java
    trunk/Jmol/src/org/jmol/viewer/StatusManager.java
    trunk/Jmol/src/org/jmol/viewer/Viewer.java
    trunk/Jmol/src/org/openscience/jmol/app/Jmol.java

Modified: trunk/Jmol/src/org/jmol/api/JmolStatusListener.java
===================================================================
--- trunk/Jmol/src/org/jmol/api/JmolStatusListener.java	2008-09-22 10:29:19 UTC (rev 9919)
+++ trunk/Jmol/src/org/jmol/api/JmolStatusListener.java	2008-09-22 10:37:58 UTC (rev 9920)
@@ -57,5 +57,5 @@
   
   public void showUrl(String url);
 
-  public String dialogAsk(String type, String data);
+  public String dialogAsk(String type, String fileName);
 }

Modified: trunk/Jmol/src/org/jmol/applet/Jmol.java
===================================================================
--- trunk/Jmol/src/org/jmol/applet/Jmol.java	2008-09-22 10:29:19 UTC (rev 9919)
+++ trunk/Jmol/src/org/jmol/applet/Jmol.java	2008-09-22 10:37:58 UTC (rev 9920)
@@ -1236,10 +1236,10 @@
       return JmolAppletRegistry.htRegistry;
     }
 
-    public String dialogAsk(String type, String data) {
+    public String dialogAsk(String type, String fileName) {
       if (!isSigned || jvm12 == null)
         return null;
-      return jvm12.dialogAsk(type, data);
+      return jvm12.dialogAsk(type, fileName);
     }
 
   }

Modified: trunk/Jmol/src/org/jmol/applet/Jvm12.java
===================================================================
--- trunk/Jmol/src/org/jmol/applet/Jvm12.java	2008-09-22 10:29:19 UTC (rev 9919)
+++ trunk/Jmol/src/org/jmol/applet/Jvm12.java	2008-09-22 10:37:58 UTC (rev 9920)
@@ -123,7 +123,7 @@
   public String dialogAsk(String type, String fileName) {
     inputFileName = fileName;
     dialogType = type;
-    System.out.println("Jvm12 thread: " + Thread.currentThread().getName());
+    //System.out.println("Jvm12 thread: " + Thread.currentThread().getName());
     try {
       SwingUtilities.invokeAndWait(new Runnable() {
         public void run() {

Modified: trunk/Jmol/src/org/jmol/viewer/StatusManager.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/StatusManager.java	2008-09-22 10:29:19 UTC (rev 9919)
+++ trunk/Jmol/src/org/jmol/viewer/StatusManager.java	2008-09-22 10:37:58 UTC (rev 9920)
@@ -468,9 +468,9 @@
     return (jmolStatusListener == null ? null : jmolStatusListener.getRegistryInfo());
   }
 
-  public String dialogAsk(String type, String data) {
+  public String dialogAsk(String type, String fileName) {
     if (jmolStatusListener != null)
-      return jmolStatusListener.dialogAsk(type, data);
+      return jmolStatusListener.dialogAsk(type, fileName);
     return "";
   }
 

Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Viewer.java	2008-09-22 10:29:19 UTC (rev 9919)
+++ trunk/Jmol/src/org/jmol/viewer/Viewer.java	2008-09-22 10:37:58 UTC (rev 9920)
@@ -3981,8 +3981,8 @@
           strError, ptLoad);
   }
 
-  public String dialogAsk(String type, String data) {
-    return statusManager.dialogAsk(type, data);
+  public String dialogAsk(String type, String fileName) {
+    return statusManager.dialogAsk(type, fileName);
   }
   
   private void setStatusFileNotLoaded(String fullPathName, String errorMsg) {

Modified: trunk/Jmol/src/org/openscience/jmol/app/Jmol.java
===================================================================
--- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java	2008-09-22 10:29:19 UTC (rev 9919)
+++ trunk/Jmol/src/org/openscience/jmol/app/Jmol.java	2008-09-22 10:37:58 UTC (rev 9920)
@@ -1851,17 +1851,17 @@
       return null;
     }
 
-    public String dialogAsk(String type, String data) {
+    public String dialogAsk(String type, String fileName) {
       if (type.equals("load"))
-        return getOpenFileNameFromDialog(data);
+        return getOpenFileNameFromDialog(fileName);
       if (type.equals("save")) {
-        return (new Dialog()).getSaveFileNameFromDialog(viewer, data,
+        return (new Dialog()).getSaveFileNameFromDialog(viewer, fileName,
             null);
       }
       if (type.equals("saveImage")) {
         Dialog sd = new Dialog();
-        String fileName = sd.getImageFileNameFromDialog(viewer,
-            data, imageType, imageChoices, imageExtensions, qualityJPG,
+        fileName = sd.getImageFileNameFromDialog(viewer,
+            fileName, imageType, imageChoices, imageExtensions, qualityJPG,
             qualityPNG);
         imageType = sd.getType();
         qualityJPG = sd.getQuality("JPG");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.