[Jmol-commits] CVS: Jmol/src/org/openscience/jmol/app PreferencesDialog.java,1.47,1.48

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

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

Modified Files:
	PreferencesDialog.java 
Log Message:
CVS-synchronized as best I could with Nico format edits -- some conflicts in Viewer.java due to function calls there, mainly my adding parameters to viewer.refresh() that allow for better status monitoring. Besides that, I MAY have solved a major crashing problem in adding "synchronized" to all StatusManager and PropertyManager methods. Also synchronized the main script() and getProperty() methods in applet.Jmol.java. So far so good. Check out the neat test demo at http://www.stolaf.edu/people/hansonr/jmol/test/json/sync.htm

Index: PreferencesDialog.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/app/PreferencesDialog.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- PreferencesDialog.java	27 Nov 2005 21:39:31 -0000	1.47
+++ PreferencesDialog.java	13 Feb 2006 06:34:55 -0000	1.48
@@ -698,7 +698,7 @@
         viewer.setColorVector(colorVector);
         currentProperties.put("colorVector",
             Integer.toString(colorVector.getRGB()));
-        viewer.refresh();
+        viewer.refresh(0, "PreferencesDialog:actionPerformed()");
       }
     };
     vButton.addActionListener(startVectorChooser);
@@ -727,7 +727,7 @@
         viewer.setColorMeasurement(colorMeasurement);
         currentProperties.put("colorMeasurement",
             Integer.toString(colorMeasurement.getRGB()));
-        viewer.refresh();
+        viewer.refresh(0, "PreferencesDialog:actionPerformed()");
       }
     };
     measurementColorButton.addActionListener(startMeasurementColorChooser);
@@ -941,7 +941,7 @@
     } catch (Exception e) {
       System.out.println("Error saving preferences" + e);
     }
-    viewer.refresh();
+    viewer.refresh(0, "PreferencesDialog:save()");
   }
 
   void initializeProperties() {
@@ -967,7 +967,7 @@
         currentProperties.put(overrides[i], overrides[i+1]);
     }
     initVariables();
-    viewer.refresh();
+    viewer.refresh(0, "PreferencesDialog:resetDefaults()");
     updateComponents();
   }