Fix "Fit" zoom level in the rocket view panel. This broke during the EventListener...

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@241 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/src/net/sf/openrocket/gui/scalefigure/ScaleScrollPane.java b/src/net/sf/openrocket/gui/scalefigure/ScaleScrollPane.java
index 75ec602f10f8f8d16d06c89968f6862bdaa9cf3b..121dc0e0bbd4e603c8652dce7977f921edb0e3b8 100644 (file)
--- a/src/net/sf/openrocket/gui/scalefigure/ScaleScrollPane.java
+++ b/src/net/sf/openrocket/gui/scalefigure/ScaleScrollPane.java
@@ -13,6 +13,7 @@ import java.awt.event.ComponentEvent;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
+import java.util.EventObject;
 
 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
@@ -29,6 +30,7 @@ import net.sf.openrocket.unit.Tick;
 import net.sf.openrocket.unit.Unit;
 import net.sf.openrocket.unit.UnitGroup;
 import net.sf.openrocket.util.BugException;
+import net.sf.openrocket.util.StateChangeListener;
 
 
 
@@ -117,9 +119,9 @@ public class ScaleScrollPane extends JScrollPane
                viewport.addMouseListener(this);
                viewport.addMouseMotionListener(this);
                
-               figure.addChangeListener(new ChangeListener() {
+               figure.addChangeListener(new StateChangeListener() {
                        @Override
-                       public void stateChanged(ChangeEvent e) {
+                       public void stateChanged(EventObject e) {
                                horizontalRuler.updateSize();
                                verticalRuler.updateSize();
                                if (fit) {

diff --git a/src/net/sf/openrocket/gui/scalefigure/ScaleSelector.java b/src/net/sf/openrocket/gui/scalefigure/ScaleSelector.java
index a93847d36505558016d526325ff9cfa11bf69c62..1e966a05ead4b1bb352f55130225f7b1e1fb4611 100644 (file)
--- a/src/net/sf/openrocket/gui/scalefigure/ScaleSelector.java
+++ b/src/net/sf/openrocket/gui/scalefigure/ScaleSelector.java
@@ -4,15 +4,15 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.text.DecimalFormat;
 import java.util.Arrays;
+import java.util.EventObject;
 
 import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JPanel;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 
 import net.miginfocom.swing.MigLayout;
 import net.sf.openrocket.gui.util.Icons;
+import net.sf.openrocket.util.StateChangeListener;
 
 public class ScaleSelector extends JPanel {
 
@@ -85,9 +85,9 @@ public class ScaleSelector extends JPanel {
                                }
                        }
                });
-               scrollPane.getFigure().addChangeListener(new ChangeListener() {
+               scrollPane.getFigure().addChangeListener(new StateChangeListener() {
                        @Override
-                       public void stateChanged(ChangeEvent e) {
+                       public void stateChanged(EventObject e) {
                                setZoomText();
                        }
                });