[Jmol-commits] CVS: Jmol/src/org/openscience/jmol/app Animate.java,1.8,1.9 DisplayPanel.java,1.11,1.12 Vibrate.java,1.8,1.9

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

Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol/app
In directory sc8-pr-cvs1:/tmp/cvs-serv7219/src/org/openscience/jmol/app

Modified Files:
	Animate.java DisplayPanel.java Vibrate.java 
Log Message:
Isolated most references to ChemFile/ChemFrame to the DeprecatedAdapter


Index: Animate.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/app/Animate.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Animate.java	14 Aug 2003 23:43:30 -0000	1.8
+++ Animate.java	15 Aug 2003 00:34:05 -0000	1.9
@@ -624,7 +624,8 @@
   synchronized void setFrame(int which, boolean setSlider) {
 
     control.setFrame(which);
-    ChemFrame frame = control.getFrame();
+    ChemFile file = (ChemFile)control.getClientFile();
+    ChemFrame frame = file.getFrame(control.getCurrentFrameNumber());
     String inf = frame.getInfo();
     if (inf != null) {
       infoLabel.setText(inf);

Index: DisplayPanel.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/app/DisplayPanel.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DisplayPanel.java	14 Aug 2003 23:43:30 -0000	1.11
+++ DisplayPanel.java	15 Aug 2003 00:34:05 -0000	1.12
@@ -655,9 +655,6 @@
     if (event.getPropertyName().equals(DisplayControl.PROP_CHEM_FILE)) {
       control.setClientFile("DisplayPanel", (ChemFile) event.getNewValue());
       setRotateMode();
-    } else if (event.getPropertyName().
-               equals(DisplayControl.PROP_CHEM_FRAME)) {
-      control.setFrame((ChemFrame) event.getNewValue());
     }
   }
 

Index: Vibrate.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/app/Vibrate.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Vibrate.java	14 Aug 2003 23:43:30 -0000	1.8
+++ Vibrate.java	15 Aug 2003 00:34:05 -0000	1.9
@@ -390,7 +390,6 @@
   private void setFrame(int which, boolean setSlider) {
 
     control.setFrame(which);
-    ChemFrame frame = control.getFrame();
     if (setSlider) {
       progressSlider.setValue(which + 1);
     }