diff --git a/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java b/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java index 080a533a2..0dd0994af 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java +++ b/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java @@ -2918,7 +2918,7 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab } protected void invalidate() { - invalidator.invalidate(); + invalidator.invalidateMe(); } diff --git a/core/src/net/sf/openrocket/util/Invalidatable.java b/core/src/net/sf/openrocket/util/Invalidatable.java index 944998944..212a4ebc8 100644 --- a/core/src/net/sf/openrocket/util/Invalidatable.java +++ b/core/src/net/sf/openrocket/util/Invalidatable.java @@ -2,7 +2,7 @@ package net.sf.openrocket.util; /** * An object that can be invalidated (in some sense of the word). After calling the - * invalidate method the object should not be used any more and it may enforce + * invalidateMe method the object should not be used any more and it may enforce * disusage for certain methods. * * @author Sampo Niskanen @@ -12,6 +12,6 @@ public interface Invalidatable { /** * Invalidate this object. */ - public void invalidate(); + void invalidateMe(); } diff --git a/core/src/net/sf/openrocket/util/Invalidator.java b/core/src/net/sf/openrocket/util/Invalidator.java index 481e9376c..e818d9a0e 100644 --- a/core/src/net/sf/openrocket/util/Invalidator.java +++ b/core/src/net/sf/openrocket/util/Invalidator.java @@ -62,7 +62,7 @@ public class Invalidator implements Invalidatable { @Override - public void invalidate() { + public void invalidateMe() { if (USE_CHECKS) { if (invalidated != null) { log.warn(monitorable + ": This object has already been invalidated, ignoring", invalidated); diff --git a/core/src/net/sf/openrocket/util/ListenerList.java b/core/src/net/sf/openrocket/util/ListenerList.java index 266ff2539..5ca48694f 100644 --- a/core/src/net/sf/openrocket/util/ListenerList.java +++ b/core/src/net/sf/openrocket/util/ListenerList.java @@ -36,7 +36,7 @@ public class ListenerList implements Invalidatable, Iterable { /** * Adds the specified listener to this list. The listener is not added if it * already is in the list (checked by the equality operator ==). This method throws - * a BugException if {@link #invalidate()} has been called. + * a BugException if {@link #invalidateMe()} has been called. * * @param listener the listener to add. * @return whether the listeners was actually added to the list. @@ -113,7 +113,7 @@ public class ListenerList implements Invalidatable, Iterable { * methods produce a warning log message. */ @Override - public void invalidate() { + public void invalidateMe() { this.invalidated = new Throwable("Invalidation occurred at this point"); if (!listeners.isEmpty()) { log.info("Invalidating " + this + " while still having listeners " + listeners); diff --git a/swing/src/net/sf/openrocket/gui/adaptors/BooleanModel.java b/swing/src/net/sf/openrocket/gui/adaptors/BooleanModel.java index 34f0d7d97..7760191d2 100644 --- a/swing/src/net/sf/openrocket/gui/adaptors/BooleanModel.java +++ b/swing/src/net/sf/openrocket/gui/adaptors/BooleanModel.java @@ -346,7 +346,7 @@ public class BooleanModel extends AbstractAction implements StateChangeListener, * model and the value cannot be set. */ @Override - public void invalidate() { + public void invalidateMe() { PropertyChangeListener[] listeners = this.getPropertyChangeListeners(); if (listeners.length > 0) { log.warn("Invalidating " + this + " while still having listeners " + Arrays.toString(listeners)); @@ -354,7 +354,7 @@ public class BooleanModel extends AbstractAction implements StateChangeListener, this.removePropertyChangeListener(l); } } - modelInvalidator.invalidate(); + modelInvalidator.invalidateMe(); } diff --git a/swing/src/net/sf/openrocket/gui/adaptors/DoubleModel.java b/swing/src/net/sf/openrocket/gui/adaptors/DoubleModel.java index 4b636d041..f235bb09a 100644 --- a/swing/src/net/sf/openrocket/gui/adaptors/DoubleModel.java +++ b/swing/src/net/sf/openrocket/gui/adaptors/DoubleModel.java @@ -156,8 +156,8 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat } @Override - public void invalidate() { - DoubleModel.this.invalidate(); + public void invalidateMe() { + DoubleModel.this.invalidateMe(); } } @@ -435,8 +435,8 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat } @Override - public void invalidate() { - DoubleModel.this.invalidate(); + public void invalidateMe() { + DoubleModel.this.invalidateMe(); } @Override @@ -578,8 +578,8 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat } @Override - public void invalidate() { - DoubleModel.this.invalidate(); + public void invalidateMe() { + DoubleModel.this.invalidateMe(); } } @@ -989,8 +989,8 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat * model and the value cannot be set. */ @Override - public void invalidate() { - modelInvalidator.invalidate(); + public void invalidateMe() { + modelInvalidator.invalidateMe(); } diff --git a/swing/src/net/sf/openrocket/gui/adaptors/EnumModel.java b/swing/src/net/sf/openrocket/gui/adaptors/EnumModel.java index b44394231..efe018e27 100644 --- a/swing/src/net/sf/openrocket/gui/adaptors/EnumModel.java +++ b/swing/src/net/sf/openrocket/gui/adaptors/EnumModel.java @@ -169,7 +169,7 @@ public class EnumModel> extends AbstractListModel } @Override - public void invalidate() { - modelInvalidator.invalidate(); + public void invalidateMe() { + modelInvalidator.invalidateMe(); } } diff --git a/swing/src/net/sf/openrocket/gui/adaptors/IntegerModel.java b/swing/src/net/sf/openrocket/gui/adaptors/IntegerModel.java index e26e981c3..3fde54331 100644 --- a/swing/src/net/sf/openrocket/gui/adaptors/IntegerModel.java +++ b/swing/src/net/sf/openrocket/gui/adaptors/IntegerModel.java @@ -301,8 +301,8 @@ public class IntegerModel implements StateChangeListener, Invalidatable { } @Override - public void invalidate() { - modelInvalidator.invalidate(); + public void invalidateMe() { + modelInvalidator.invalidateMe(); } } diff --git a/swing/src/net/sf/openrocket/gui/adaptors/MaterialModel.java b/swing/src/net/sf/openrocket/gui/adaptors/MaterialModel.java index 04444c01f..9f60ecb7f 100644 --- a/swing/src/net/sf/openrocket/gui/adaptors/MaterialModel.java +++ b/swing/src/net/sf/openrocket/gui/adaptors/MaterialModel.java @@ -171,8 +171,8 @@ public class MaterialModel extends AbstractListModel implements } @Override - public void invalidate() { - modelInvalidator.invalidate(); + public void invalidateMe() { + modelInvalidator.invalidateMe(); } @Override diff --git a/swing/src/net/sf/openrocket/gui/adaptors/ModelInvalidator.java b/swing/src/net/sf/openrocket/gui/adaptors/ModelInvalidator.java index a67e9bd1c..d1d18411e 100644 --- a/swing/src/net/sf/openrocket/gui/adaptors/ModelInvalidator.java +++ b/swing/src/net/sf/openrocket/gui/adaptors/ModelInvalidator.java @@ -97,9 +97,9 @@ public class ModelInvalidator implements StateChangeListener, Invalidatable, Cha * model and the value cannot be set. */ @Override - public void invalidate() { + public void invalidateMe() { log.trace("Invalidating " + this); - invalidator.invalidate(); + invalidator.invalidateMe(); if (!listeners.isEmpty()) { log.warn("Invalidating " + this + " while still having listeners " + listeners); diff --git a/swing/src/net/sf/openrocket/gui/adaptors/PresetModel.java b/swing/src/net/sf/openrocket/gui/adaptors/PresetModel.java index d93f2d510..dbe8a605e 100644 --- a/swing/src/net/sf/openrocket/gui/adaptors/PresetModel.java +++ b/swing/src/net/sf/openrocket/gui/adaptors/PresetModel.java @@ -108,8 +108,8 @@ public class PresetModel extends AbstractListModel } @Override - public void invalidate() { - modelInvalidator.invalidate(); + public void invalidateMe() { + modelInvalidator.invalidateMe(); } @Override diff --git a/swing/src/net/sf/openrocket/gui/adaptors/TransitionShapeModel.java b/swing/src/net/sf/openrocket/gui/adaptors/TransitionShapeModel.java index 267cbd3e3..1ba31cfdc 100644 --- a/swing/src/net/sf/openrocket/gui/adaptors/TransitionShapeModel.java +++ b/swing/src/net/sf/openrocket/gui/adaptors/TransitionShapeModel.java @@ -66,8 +66,8 @@ public class TransitionShapeModel extends AbstractListModel } @Override - public void invalidate() { - modelInvalidator.invalidate(); + public void invalidateMe() { + modelInvalidator.invalidateMe(); } @Override diff --git a/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java b/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java index 772bb5b83..9e93a5cfc 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java @@ -782,10 +782,10 @@ public class AppearancePanel extends JPanel implements Invalidatable, Invalidati } @Override - public void invalidate() { + public void invalidateMe() { super.invalidate(); for (Invalidatable i : invalidatables) { - i.invalidate(); + i.invalidateMe(); } } } diff --git a/swing/src/net/sf/openrocket/gui/configdialog/ComponentConfigDialog.java b/swing/src/net/sf/openrocket/gui/configdialog/ComponentConfigDialog.java index c3c953faf..9ba53d0ec 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/ComponentConfigDialog.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/ComponentConfigDialog.java @@ -71,7 +71,7 @@ public class ComponentConfigDialog extends JDialog implements ComponentChangeLis */ public void windowClosed(WindowEvent e){ configurator.clearConfigListeners(); - configurator.invalidate(); + configurator.invalidateMe(); document.getRocket().removeComponentChangeListener(ComponentConfigDialog.this); ComponentConfigDialog.this.dispose(); if (clearConfigListeners) { diff --git a/swing/src/net/sf/openrocket/gui/configdialog/InstancesPanel.java b/swing/src/net/sf/openrocket/gui/configdialog/InstancesPanel.java index 09f172809..6a79a81e9 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/InstancesPanel.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/InstancesPanel.java @@ -70,10 +70,10 @@ public class InstancesPanel extends JPanel implements Invalidatable, Invalidatin } @Override - public void invalidate() { + public void invalidateMe() { super.invalidate(); for (Invalidatable i : invalidatables) { - i.invalidate(); + i.invalidateMe(); } } } diff --git a/swing/src/net/sf/openrocket/gui/configdialog/MaterialPanel.java b/swing/src/net/sf/openrocket/gui/configdialog/MaterialPanel.java index e4ac2d30a..a595ef100 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/MaterialPanel.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/MaterialPanel.java @@ -114,10 +114,10 @@ public class MaterialPanel extends JPanel implements Invalidatable, Invalidating } @Override - public void invalidate() { + public void invalidateMe() { super.invalidate(); for (Invalidatable i : invalidatables) { - i.invalidate(); + i.invalidateMe(); } } } diff --git a/swing/src/net/sf/openrocket/gui/configdialog/MotorConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/MotorConfig.java index 5391979dd..47d51d0e0 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/MotorConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/MotorConfig.java @@ -150,10 +150,10 @@ public class MotorConfig extends JPanel implements Invalidatable, InvalidatingWi } @Override - public void invalidate() { + public void invalidateMe() { super.invalidate(); for (Invalidatable i : invalidatables) { - i.invalidate(); + i.invalidateMe(); } } diff --git a/swing/src/net/sf/openrocket/gui/configdialog/PlacementPanel.java b/swing/src/net/sf/openrocket/gui/configdialog/PlacementPanel.java index 500f40f79..4c77c239e 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/PlacementPanel.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/PlacementPanel.java @@ -75,10 +75,10 @@ public class PlacementPanel extends JPanel implements Invalidatable, Invalidatin } @Override - public void invalidate() { + public void invalidateMe() { super.invalidate(); for (Invalidatable i : invalidatables) { - i.invalidate(); + i.invalidateMe(); } } } diff --git a/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java index bf14be095..4e7fb85c5 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java @@ -62,7 +62,7 @@ import net.sf.openrocket.startup.Preferences; import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.util.Invalidatable; -public class RocketComponentConfig extends JPanel implements InvalidatingWidget { +public class RocketComponentConfig extends JPanel implements Invalidatable, InvalidatingWidget { private static final long serialVersionUID = -2925484062132243982L; private static final Translator trans = Application.getTranslator(); @@ -1010,10 +1010,10 @@ public class RocketComponentConfig extends JPanel implements InvalidatingWidget } @Override - public void invalidate() { + public void invalidateMe() { super.invalidate(); for (Invalidatable i : invalidatables) { - i.invalidate(); + i.invalidateMe(); } } diff --git a/swing/src/net/sf/openrocket/gui/util/GUIUtil.java b/swing/src/net/sf/openrocket/gui/util/GUIUtil.java index 5a3541888..5b65cf723 100644 --- a/swing/src/net/sf/openrocket/gui/util/GUIUtil.java +++ b/swing/src/net/sf/openrocket/gui/util/GUIUtil.java @@ -589,7 +589,7 @@ public class GUIUtil { SpinnerModel model = spinner.getModel(); spinner.setModel(new SpinnerNumberModel()); if (model instanceof Invalidatable) { - ((Invalidatable) model).invalidate(); + ((Invalidatable) model).invalidateMe(); } } else if (c instanceof JSlider) { @@ -601,7 +601,7 @@ public class GUIUtil { BoundedRangeModel model = slider.getModel(); slider.setModel(new DefaultBoundedRangeModel()); if (model instanceof Invalidatable) { - ((Invalidatable) model).invalidate(); + ((Invalidatable) model).invalidateMe(); } } else if (c instanceof JComboBox) { @@ -613,7 +613,7 @@ public class GUIUtil { ComboBoxModel model = combo.getModel(); combo.setModel(new DefaultComboBoxModel()); if (model instanceof Invalidatable) { - ((Invalidatable) model).invalidate(); + ((Invalidatable) model).invalidateMe(); } } else if (c instanceof AbstractButton) { @@ -631,7 +631,7 @@ public class GUIUtil { } }); if (model instanceof Invalidatable) { - ((Invalidatable) model).invalidate(); + ((Invalidatable) model).invalidateMe(); } } else if (c instanceof JTable) { @@ -640,19 +640,19 @@ public class GUIUtil { TableModel model1 = table.getModel(); table.setModel(new DefaultTableModel()); if (model1 instanceof Invalidatable) { - ((Invalidatable) model1).invalidate(); + ((Invalidatable) model1).invalidateMe(); } TableColumnModel model2 = table.getColumnModel(); table.setColumnModel(new DefaultTableColumnModel()); if (model2 instanceof Invalidatable) { - ((Invalidatable) model2).invalidate(); + ((Invalidatable) model2).invalidateMe(); } ListSelectionModel model3 = table.getSelectionModel(); table.setSelectionModel(new DefaultListSelectionModel()); if (model3 instanceof Invalidatable) { - ((Invalidatable) model3).invalidate(); + ((Invalidatable) model3).invalidateMe(); } } else if (c instanceof JTree) { @@ -661,13 +661,13 @@ public class GUIUtil { TreeModel model1 = tree.getModel(); tree.setModel(new DefaultTreeModel(new DefaultMutableTreeNode())); if (model1 instanceof Invalidatable) { - ((Invalidatable) model1).invalidate(); + ((Invalidatable) model1).invalidateMe(); } TreeSelectionModel model2 = tree.getSelectionModel(); tree.setSelectionModel(new DefaultTreeSelectionModel()); if (model2 instanceof Invalidatable) { - ((Invalidatable) model2).invalidate(); + ((Invalidatable) model2).invalidateMe(); } } else if (c instanceof Resettable) {