Menu
▾
▴
[Jmol-commits] CVS: Jmol/src/org/openscience/jmol/app Animate.java,1.12,1.13 CalculateChemicalShifts.java,1.6,1.7 CrystalPropertiesDialog.java,1.11,1.12 Jmol.java,1.31,1.32 MakeCrystal.java,1.4,1.5 PropertyGraph.java,1.6,1.7 TransformDialog.java,1.4,1.5 Vibrate.java,1.12,1.13
|
From: Michael T H. <mic...@us...> - 2003-08-19 23:02:32
|
Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol/app
In directory sc8-pr-cvs1:/tmp/cvs-serv20460/src/org/openscience/jmol/app
Modified Files:
Animate.java CalculateChemicalShifts.java
CrystalPropertiesDialog.java Jmol.java MakeCrystal.java
PropertyGraph.java TransformDialog.java Vibrate.java
Log Message:
removed propertyChangeSupport from JmolViewer, fixed chemfile-dependent actions
Index: Animate.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/app/Animate.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Animate.java 18 Aug 2003 20:52:59 -0000 1.12
+++ Animate.java 19 Aug 2003 21:10:09 -0000 1.13
@@ -703,7 +703,7 @@
public void propertyChange(PropertyChangeEvent event) {
- if (event.getPropertyName().equals(JmolViewer.PROP_CHEM_FILE)) {
+ if (event.getPropertyName().equals(Jmol.chemFileProperty)) {
if (event.getNewValue() != inFile && event.getNewValue() != cf) {
setChemFile((ChemFile) event.getNewValue());
}
Index: CalculateChemicalShifts.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/app/CalculateChemicalShifts.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CalculateChemicalShifts.java 16 Aug 2003 14:50:43 -0000 1.6
+++ CalculateChemicalShifts.java 19 Aug 2003 21:10:09 -0000 1.7
@@ -176,7 +176,7 @@
public void propertyChange(PropertyChangeEvent event) {
- if (event.getPropertyName().equals(JmolViewer.PROP_CHEM_FILE)) {
+ if (event.getPropertyName().equals(Jmol.chemFileProperty)) {
setChemFile((ChemFile) event.getNewValue());
}
}
Index: CrystalPropertiesDialog.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/app/CrystalPropertiesDialog.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- CrystalPropertiesDialog.java 18 Aug 2003 20:52:59 -0000 1.11
+++ CrystalPropertiesDialog.java 19 Aug 2003 21:10:09 -0000 1.12
@@ -2177,7 +2177,7 @@
*/
public void propertyChange(PropertyChangeEvent event) {
- if (event.getPropertyName().equals(JmolViewer.PROP_CHEM_FILE)) {
+ if (event.getPropertyName().equals(Jmol.chemFileProperty)) {
if (event.getNewValue() != chemFile) {
setChemFile((ChemFile) event.getNewValue());
}
Index: Jmol.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/app/Jmol.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Jmol.java 19 Aug 2003 10:25:33 -0000 1.31
+++ Jmol.java 19 Aug 2003 21:10:09 -0000 1.32
@@ -71,6 +71,7 @@
import java.awt.event.WindowEvent;
import java.awt.event.MouseEvent;
import java.awt.geom.*;
+import java.beans.PropertyChangeSupport;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.BufferedReader;
@@ -165,6 +166,9 @@
private static int numWindows = 0;
private static Dimension screenSize = null;
+ private PropertyChangeSupport pcs = new PropertyChangeSupport(this);
+
+
/**
* The current file.
*/
@@ -246,12 +250,11 @@
System.out.println("using CDK Model Adapter");
modelAdapter = new CdkJmolModelAdapter();
}
- boolean firePropertyChanges = false;
- viewer = new JmolViewer(display, modelAdapter, firePropertyChanges);
+ viewer = new JmolViewer(display, modelAdapter);
display.setViewer(viewer);
- // viewer.addPropertyChangeListener(display);
+ // pcs.addPropertyChangeListener(display);
say("Initializing Preferences...");
preferencesDialog = new PreferencesDialog(frame, guimap, viewer);
say("Initializing Animate...");
@@ -259,17 +262,17 @@
// mth 2003 08 15
// get rid of this property change listener for Animate.java
// may break animations
- viewer.addPropertyChangeListener(anim);
+ // pcs.addPropertyChangeListener(anim);
say("Initializing Vibrate...");
vib = new Vibrate(viewer, frame);
- viewer.addPropertyChangeListener(vib);
+ // pcs.addPropertyChangeListener(vib);
say("Initializing Crystal...");
crystprop = new CrystalPropertiesDialog(viewer, frame);
- viewer.addPropertyChangeListener(crystprop);
+ // pcs.addPropertyChangeListener(crystprop);
makecrystal = new MakeCrystal(viewer, crystprop);
- viewer.addPropertyChangeListener(makecrystal);
+ // pcs.addPropertyChangeListener(makecrystal);
transform = new TransformDialog(viewer, frame);
- viewer.addPropertyChangeListener(transform);
+ // pcs.addPropertyChangeListener(transform);
say("Initializing Recent Files...");
recentFiles = new RecentFilesDialog(frame);
say("Initializing Script Window...");
@@ -278,7 +281,7 @@
viewer.setJmolStatusListener(new MyJmolStatusListener());
say("Initializing Property Graph...");
pg = new PropertyGraph(frame);
- viewer.addPropertyChangeListener(pg);
+ // pcs.addPropertyChangeListener(pg);
say("Initializing Measurements...");
mlist = new MeasurementList(frame, viewer);
@@ -321,7 +324,7 @@
say("Initializing Chemical Shifts...");
chemicalShifts.initialize(apm);
- viewer.addPropertyChangeListener(chemicalShifts);
+ // pcs.addPropertyChangeListener(chemicalShifts);
say("Starting display...");
display.start();
@@ -337,16 +340,11 @@
exportChooser = new JFileChooser();
exportChooser.setCurrentDirectory(currentDir);
- viewer.addPropertyChangeListener(JmolViewer.PROP_CHEM_FILE,
- saveAction);
- viewer.addPropertyChangeListener(JmolViewer.PROP_CHEM_FILE,
- exportAction);
- viewer.addPropertyChangeListener(JmolViewer.PROP_CHEM_FILE,
- povrayAction);
- viewer.addPropertyChangeListener(JmolViewer.PROP_CHEM_FILE,
- pdfAction);
- viewer.addPropertyChangeListener(JmolViewer.PROP_CHEM_FILE,
- printAction);
+ pcs.addPropertyChangeListener(chemFileProperty, saveAction);
+ pcs.addPropertyChangeListener(chemFileProperty, exportAction);
+ pcs.addPropertyChangeListener(chemFileProperty, povrayAction);
+ pcs.addPropertyChangeListener(chemFileProperty, pdfAction);
+ pcs.addPropertyChangeListener(chemFileProperty, printAction);
jmolpopup = new JmolPopup(viewer, display);
@@ -1374,7 +1372,7 @@
return new File(System.getProperty("user.dir"));
}
- public static final String openFileProperty = "openFile";
+ public static final String chemFileProperty = "chemFile";
private abstract class MoleculeDependentAction extends AbstractAction
implements PropertyChangeListener {
@@ -1386,7 +1384,7 @@
public void propertyChange(PropertyChangeEvent event) {
- if (event.getPropertyName().equals(JmolViewer.PROP_CHEM_FILE)) {
+ if (event.getPropertyName().equals(chemFileProperty)) {
if (event.getNewValue() != null) {
setEnabled(true);
} else {
@@ -1398,7 +1396,7 @@
class MyJmolStatusListener implements JmolStatusListener {
public void notifyFileLoaded(String fullPathName, String fileName,
- String modelName) {
+ String modelName, Object clientFile) {
String title = modelName;
if (title == null)
title = fileName;
@@ -1406,6 +1404,7 @@
title = "Jmol";
frame.setTitle(title);
recentFiles.notifyFileOpen(fullPathName);
+ pcs.firePropertyChange(chemFileProperty, null, clientFile);
}
public void notifyFileNotLoaded(String fileName, String errorMsg) {
Index: MakeCrystal.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/app/MakeCrystal.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MakeCrystal.java 16 Aug 2003 14:50:43 -0000 1.4
+++ MakeCrystal.java 19 Aug 2003 21:10:09 -0000 1.5
@@ -154,7 +154,7 @@
public void propertyChange(PropertyChangeEvent event) {
- if (event.getPropertyName().equals(JmolViewer.PROP_CHEM_FILE)) {
+ if (event.getPropertyName().equals(Jmol.chemFileProperty)) {
setChemFile((ChemFile) event.getNewValue());
}
}
Index: PropertyGraph.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/app/PropertyGraph.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PropertyGraph.java 16 Aug 2003 14:50:43 -0000 1.6
+++ PropertyGraph.java 19 Aug 2003 21:10:09 -0000 1.7
@@ -370,7 +370,7 @@
public void propertyChange(PropertyChangeEvent event) {
- if (event.getPropertyName().equals(JmolViewer.PROP_CHEM_FILE)) {
+ if (event.getPropertyName().equals(Jmol.chemFileProperty)) {
setChemFile((ChemFile) event.getNewValue());
}
}
Index: TransformDialog.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/app/TransformDialog.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TransformDialog.java 16 Aug 2003 14:50:43 -0000 1.4
+++ TransformDialog.java 19 Aug 2003 21:10:09 -0000 1.5
@@ -272,7 +272,7 @@
}
public void propertyChange(PropertyChangeEvent event) {
- if (event.getPropertyName().equals(JmolViewer.PROP_CHEM_FILE)) {
+ if (event.getPropertyName().equals(Jmol.chemFileProperty)) {
setChemFile((ChemFile) event.getNewValue());
}
}
Index: Vibrate.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/app/Vibrate.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Vibrate.java 18 Aug 2003 20:52:59 -0000 1.12
+++ Vibrate.java 19 Aug 2003 21:10:09 -0000 1.13
@@ -917,7 +917,7 @@
public void propertyChange(PropertyChangeEvent event) {
- if (event.getPropertyName().equals(JmolViewer.PROP_CHEM_FILE)) {
+ if (event.getPropertyName().equals(Jmol.chemFileProperty)) {
if (event.getNewValue() != inputFile && event.getNewValue() != vibFile) {
setChemFile((ChemFile) event.getNewValue());
}
|