[Jmol-commits] CVS: Jmol/src/org/jmol/api JmolSimpleViewer.java,1.3,1.4 JmolViewer.java,1.3,1.4

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

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

Modified Files:
	JmolSimpleViewer.java JmolViewer.java 
Log Message:
Cleaned up Integration.java example


Index: JmolSimpleViewer.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/jmol/api/JmolSimpleViewer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JmolSimpleViewer.java	18 Nov 2004 22:09:12 -0000	1.3
+++ JmolSimpleViewer.java	18 Nov 2004 23:57:42 -0000	1.4
@@ -27,24 +27,19 @@
 import java.awt.Graphics;
 import java.awt.Dimension;
 import java.awt.Rectangle;
-import java.awt.Image;
 
 /**
  * This is the high-level API for the JmolViewer for simple access.
- * <p>
- * We will implement a low-level API at some point
  **/
 
 public interface JmolSimpleViewer {
 
   public void renderScreenImage(Graphics g, Dimension size, Rectangle clip);
 
-  public Image getScreenImage();
-
-  public void releaseScreenImage();
-
   public String evalFile(String strFilename);
-
   public String evalString(String strScript);
 
+  public void openStringInline(String strModel);
+  public void openFile(String name);
+  public String getOpenFileError();
 }

Index: JmolViewer.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/jmol/api/JmolViewer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JmolViewer.java	18 Nov 2004 22:09:12 -0000	1.3
+++ JmolViewer.java	18 Nov 2004 23:57:42 -0000	1.4
@@ -28,6 +28,7 @@
 import java.awt.Dimension;
 import java.awt.Event;
 import java.awt.Color;
+import java.awt.Image;
 import java.net.URL;
 import java.util.BitSet;
 import java.util.Properties;
@@ -70,14 +71,16 @@
   public int getScreenWidth();
   public int getScreenHeight();
 
+  public Image getScreenImage();
+  public void releaseScreenImage();
+
+
   public void notifyRepainted();
 
   public boolean handleOldJvm10Event(Event e);
 
   public int getMotionEventNumber();
 
-  public void openStringInline(String strModel);
-  public void openFile(String name);
   public void openReader(String fullPathName, String name, Reader reader);
   public void openClientFile(String fullPathName, String fileName,
                              Object clientFile);
@@ -88,8 +91,6 @@
   public String getMeasurementStringValue(int i);
   public int[] getMeasurementCountPlusIndices(int i);
 
-  public String getOpenFileError();
-
   public Component getAwtComponent();
 
   public BitSet getElementsPresentBitSet();