[Jmol-commits] SF.net SVN: jmol:[16869] trunk/Jmol

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

Revision: 16869
          http://jmol.svn.sourceforge.net/jmol/?rev=16869&view=rev
Author:   hansonr
Date:     2012-03-08 14:24:06 +0000 (Thu, 08 Mar 2012)
Log Message:
-----------
JSpecViewPro

Modified Paths:
--------------
    trunk/Jmol/appletweb/JSpecViewApplet.jar
    trunk/Jmol/appletweb/JSpecViewAppletSigned.jar
    trunk/Jmol/jars/JSpecView.jar
    trunk/Jmol/src/org/openscience/jmol/app/jmolpanel/StatusListener.java

Added Paths:
-----------
    trunk/Jmol/appletweb/JSpecViewAppletPro.jar
    trunk/Jmol/src/org/jmol/api/JSVInterface.java

Modified: trunk/Jmol/appletweb/JSpecViewApplet.jar
===================================================================
(Binary files differ)

Added: trunk/Jmol/appletweb/JSpecViewAppletPro.jar
===================================================================
(Binary files differ)


Property changes on: trunk/Jmol/appletweb/JSpecViewAppletPro.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/Jmol/appletweb/JSpecViewAppletSigned.jar
===================================================================
(Binary files differ)

Modified: trunk/Jmol/jars/JSpecView.jar
===================================================================
(Binary files differ)

Added: trunk/Jmol/src/org/jmol/api/JSVInterface.java
===================================================================
--- trunk/Jmol/src/org/jmol/api/JSVInterface.java	                        (rev 0)
+++ trunk/Jmol/src/org/jmol/api/JSVInterface.java	2012-03-08 14:24:06 UTC (rev 16869)
@@ -0,0 +1,11 @@
+package org.jmol.api;
+
+import java.util.Properties;
+
+public interface JSVInterface {
+  
+  public void setProperties(Properties properties);  
+  public void saveProperties(Properties properties);
+  public void exitJSpecView(boolean withDialog, Object frame);
+
+}

Modified: trunk/Jmol/src/org/openscience/jmol/app/jmolpanel/StatusListener.java
===================================================================
--- trunk/Jmol/src/org/openscience/jmol/app/jmolpanel/StatusListener.java	2012-03-07 21:52:50 UTC (rev 16868)
+++ trunk/Jmol/src/org/openscience/jmol/app/jmolpanel/StatusListener.java	2012-03-08 14:24:06 UTC (rev 16869)
@@ -23,6 +23,7 @@
  */
 package org.openscience.jmol.app.jmolpanel;
 
+import org.jmol.api.JSVInterface;
 import org.jmol.api.JmolAppConsoleInterface;
 import org.jmol.api.JmolCallbackListener;
 import org.jmol.api.JmolStatusListener;
@@ -33,13 +34,16 @@
 import org.jmol.util.Logger;
 import org.openscience.jmol.app.webexport.WebExport;
 
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.lang.reflect.Method;
 import java.net.URI;
 import java.util.Map;
+import java.util.Properties;
 
 import jspecview.application.MainFrame;
 
-class StatusListener implements JmolStatusListener, JmolSyncInterface {
+class StatusListener implements JmolStatusListener, JmolSyncInterface, JSVInterface {
 
   /*
    * starting with Jmol 11.7.27, JmolStatusListener extends JmolCallbackListener
@@ -347,7 +351,7 @@
 
   public void setJSpecView(String peaks) {
     if (jSpecViewFrame == null) {
-      jSpecViewFrame = new MainFrame();
+      jSpecViewFrame = new MainFrame(this);
       jSpecViewFrame.setSize(800, 500);
       jSpecViewFrame.setLocation(400, 400);
       jSpecViewFrame.register("Jmol", this);
@@ -368,6 +372,32 @@
     jmol.syncScript(script);    
   }
 
+  private static String propertiesFileName = "jspecview.properties";
 
+  public void setProperties(Properties properties) {
+    try {
+      FileInputStream fileIn = new FileInputStream(propertiesFileName);
+      properties.load(fileIn);
+    } catch (Exception e) {
+    }
+  }
+
+  public void saveProperties(Properties properties) {
+    // Write out current properties
+    try {
+      FileOutputStream fileOut = new FileOutputStream(propertiesFileName);
+      properties.store(fileOut, "JSpecView Application Properties");
+    } catch (Exception e) {
+    }
+  }
+
+  /**
+   * @param withDialog  
+   * @param frame 
+   */
+  public void exitJSpecView(boolean withDialog, Object frame) {
+    // no exit from Jmol
+  }
+
   
 }

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