From ce54de10399ed25de7dc64cd784e31cb3a64bb1e Mon Sep 17 00:00:00 2001 From: Kevin Ruland Date: Wed, 21 Dec 2011 18:22:08 +0000 Subject: [PATCH] Fix "Fit" zoom level in the rocket view panel. This broke during the EventListener refactoring from a little while ago. --- .../sf/openrocket/gui/scalefigure/ScaleScrollPane.java | 6 ++++-- src/net/sf/openrocket/gui/scalefigure/ScaleSelector.java | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/net/sf/openrocket/gui/scalefigure/ScaleScrollPane.java b/src/net/sf/openrocket/gui/scalefigure/ScaleScrollPane.java index 75ec602f1..121dc0e0b 100644 --- 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 a93847d36..1e966a05e 100644 --- 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(); } });