hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename custom invalidate method to avoid confusion with java.awt invalidate

Browse Source 
This caused issue because the invalidating of invalidatables was sometimes triggered by AWT processes
This commit is contained in:
SiboVG 2024-01-24 01:53:04 +01:00
parent 131f26e1c5
commit 24e72f0bd1
20 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
View File

@ -2918,7 +2918,7 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
} }
protected void invalidate() { protected void invalidate() {
invalidator.invalidate(); invalidator.invalidateMe();
} }

4
core/src/net/sf/openrocket/util/Invalidatable.java
View File

@ -2,7 +2,7 @@ package net.sf.openrocket.util;
/** /**
* An object that can be invalidated (in some sense of the word). After calling the * 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. * disusage for certain methods.
* *
* @author Sampo Niskanen <sampo.niskanen@iki.fi> * @author Sampo Niskanen <sampo.niskanen@iki.fi>
@ -12,6 +12,6 @@ public interface Invalidatable {
/** /**
* Invalidate this object. * Invalidate this object.
*/ */
public void invalidate(); void invalidateMe();
} }

2
core/src/net/sf/openrocket/util/Invalidator.java
View File

@ -62,7 +62,7 @@ public class Invalidator implements Invalidatable {
@Override @Override
public void invalidate() { public void invalidateMe() {
if (USE_CHECKS) { if (USE_CHECKS) {
if (invalidated != null) { if (invalidated != null) {
log.warn(monitorable + ": This object has already been invalidated, ignoring", invalidated); log.warn(monitorable + ": This object has already been invalidated, ignoring", invalidated);

4
core/src/net/sf/openrocket/util/ListenerList.java
View File

@ -36,7 +36,7 @@ public class ListenerList<T> implements Invalidatable, Iterable<T> {
/** /**
* Adds the specified listener to this list. The listener is not added if it * 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 * 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. * @param listener the listener to add.
* @return whether the listeners was actually added to the list. * @return whether the listeners was actually added to the list.
@ -113,7 +113,7 @@ public class ListenerList<T> implements Invalidatable, Iterable<T> {
* methods produce a warning log message. * methods produce a warning log message.
*/ */
@Override @Override
public void invalidate() { public void invalidateMe() {
this.invalidated = new Throwable("Invalidation occurred at this point"); this.invalidated = new Throwable("Invalidation occurred at this point");
if (!listeners.isEmpty()) { if (!listeners.isEmpty()) {
log.info("Invalidating " + this + " while still having listeners " + listeners); log.info("Invalidating " + this + " while still having listeners " + listeners);

4
swing/src/net/sf/openrocket/gui/adaptors/BooleanModel.java
View File

@ -346,7 +346,7 @@ public class BooleanModel extends AbstractAction implements StateChangeListener,
* model and the value cannot be set. * model and the value cannot be set.
*/ */
@Override @Override
public void invalidate() { public void invalidateMe() {
PropertyChangeListener[] listeners = this.getPropertyChangeListeners(); PropertyChangeListener[] listeners = this.getPropertyChangeListeners();
if (listeners.length > 0) { if (listeners.length > 0) {
log.warn("Invalidating " + this + " while still having listeners " + Arrays.toString(listeners)); 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); this.removePropertyChangeListener(l);
} }
} }
modelInvalidator.invalidate(); modelInvalidator.invalidateMe();
} }

16
swing/src/net/sf/openrocket/gui/adaptors/DoubleModel.java
View File

@ -156,8 +156,8 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat
} }
@Override @Override
public void invalidate() { public void invalidateMe() {
DoubleModel.this.invalidate(); DoubleModel.this.invalidateMe();
} }
} }
@ -435,8 +435,8 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat
} }
@Override @Override
public void invalidate() { public void invalidateMe() {
DoubleModel.this.invalidate(); DoubleModel.this.invalidateMe();
} }
@Override @Override
@ -578,8 +578,8 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat
} }
@Override @Override
public void invalidate() { public void invalidateMe() {
DoubleModel.this.invalidate(); DoubleModel.this.invalidateMe();
} }
} }
@ -989,8 +989,8 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat
* model and the value cannot be set. * model and the value cannot be set.
*/ */
@Override @Override
public void invalidate() { public void invalidateMe() {
modelInvalidator.invalidate(); modelInvalidator.invalidateMe();
} }

4
swing/src/net/sf/openrocket/gui/adaptors/EnumModel.java
View File

@ -169,7 +169,7 @@ public class EnumModel<T extends Enum<T>> extends AbstractListModel<T>
} }
@Override @Override
public void invalidate() { public void invalidateMe() {
modelInvalidator.invalidate(); modelInvalidator.invalidateMe();
} }
} }

4
swing/src/net/sf/openrocket/gui/adaptors/IntegerModel.java
View File

@ -301,8 +301,8 @@ public class IntegerModel implements StateChangeListener, Invalidatable {
} }
@Override @Override
public void invalidate() { public void invalidateMe() {
modelInvalidator.invalidate(); modelInvalidator.invalidateMe();
} }
} }

4
swing/src/net/sf/openrocket/gui/adaptors/MaterialModel.java
View File

@ -171,8 +171,8 @@ public class MaterialModel extends AbstractListModel<Material> implements
} }
@Override @Override
public void invalidate() { public void invalidateMe() {
modelInvalidator.invalidate(); modelInvalidator.invalidateMe();
} }
@Override @Override

4
swing/src/net/sf/openrocket/gui/adaptors/ModelInvalidator.java
View File

@ -97,9 +97,9 @@ public class ModelInvalidator implements StateChangeListener, Invalidatable, Cha
* model and the value cannot be set. * model and the value cannot be set.
*/ */
@Override @Override
public void invalidate() { public void invalidateMe() {
log.trace("Invalidating " + this); log.trace("Invalidating " + this);
invalidator.invalidate(); invalidator.invalidateMe();
if (!listeners.isEmpty()) { if (!listeners.isEmpty()) {
log.warn("Invalidating " + this + " while still having listeners " + listeners); log.warn("Invalidating " + this + " while still having listeners " + listeners);

4
swing/src/net/sf/openrocket/gui/adaptors/PresetModel.java
View File

@ -108,8 +108,8 @@ public class PresetModel extends AbstractListModel
} }
@Override @Override
public void invalidate() { public void invalidateMe() {
modelInvalidator.invalidate(); modelInvalidator.invalidateMe();
} }
@Override @Override

4
swing/src/net/sf/openrocket/gui/adaptors/TransitionShapeModel.java
View File

@ -66,8 +66,8 @@ public class TransitionShapeModel extends AbstractListModel<Transition.Shape>
} }
@Override @Override
public void invalidate() { public void invalidateMe() {
modelInvalidator.invalidate(); modelInvalidator.invalidateMe();
} }
@Override @Override

4
swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java
View File

@ -782,10 +782,10 @@ public class AppearancePanel extends JPanel implements Invalidatable, Invalidati
} }
@Override @Override
public void invalidate() { public void invalidateMe() {
super.invalidate(); super.invalidate();
for (Invalidatable i : invalidatables) { for (Invalidatable i : invalidatables) {
i.invalidate(); i.invalidateMe();
} }
} }
} }

2
swing/src/net/sf/openrocket/gui/configdialog/ComponentConfigDialog.java
View File

@ -71,7 +71,7 @@ public class ComponentConfigDialog extends JDialog implements ComponentChangeLis
*/ */
public void windowClosed(WindowEvent e){ public void windowClosed(WindowEvent e){
configurator.clearConfigListeners(); configurator.clearConfigListeners();
configurator.invalidate(); configurator.invalidateMe();
document.getRocket().removeComponentChangeListener(ComponentConfigDialog.this); document.getRocket().removeComponentChangeListener(ComponentConfigDialog.this);
ComponentConfigDialog.this.dispose(); ComponentConfigDialog.this.dispose();
if (clearConfigListeners) { if (clearConfigListeners) {

4
swing/src/net/sf/openrocket/gui/configdialog/InstancesPanel.java
View File

@ -70,10 +70,10 @@ public class InstancesPanel extends JPanel implements Invalidatable, Invalidatin
} }
@Override @Override
public void invalidate() { public void invalidateMe() {
super.invalidate(); super.invalidate();
for (Invalidatable i : invalidatables) { for (Invalidatable i : invalidatables) {
i.invalidate(); i.invalidateMe();
} }
} }
} }

4
swing/src/net/sf/openrocket/gui/configdialog/MaterialPanel.java
View File

@ -114,10 +114,10 @@ public class MaterialPanel extends JPanel implements Invalidatable, Invalidating
} }
@Override @Override
public void invalidate() { public void invalidateMe() {
super.invalidate(); super.invalidate();
for (Invalidatable i : invalidatables) { for (Invalidatable i : invalidatables) {
i.invalidate(); i.invalidateMe();
} }
} }
} }

4
swing/src/net/sf/openrocket/gui/configdialog/MotorConfig.java
View File

@ -150,10 +150,10 @@ public class MotorConfig extends JPanel implements Invalidatable, InvalidatingWi
} }
@Override @Override
public void invalidate() { public void invalidateMe() {
super.invalidate(); super.invalidate();
for (Invalidatable i : invalidatables) { for (Invalidatable i : invalidatables) {
i.invalidate(); i.invalidateMe();
} }
} }

4
swing/src/net/sf/openrocket/gui/configdialog/PlacementPanel.java
View File

@ -75,10 +75,10 @@ public class PlacementPanel extends JPanel implements Invalidatable, Invalidatin
} }
@Override @Override
public void invalidate() { public void invalidateMe() {
super.invalidate(); super.invalidate();
for (Invalidatable i : invalidatables) { for (Invalidatable i : invalidatables) {
i.invalidate(); i.invalidateMe();
} }
} }
} }

6
swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java
View File

@ -62,7 +62,7 @@ import net.sf.openrocket.startup.Preferences;
import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.unit.UnitGroup;
import net.sf.openrocket.util.Invalidatable; 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 long serialVersionUID = -2925484062132243982L;
private static final Translator trans = Application.getTranslator(); private static final Translator trans = Application.getTranslator();
@ -1010,10 +1010,10 @@ public class RocketComponentConfig extends JPanel implements InvalidatingWidget
} }
@Override @Override
public void invalidate() { public void invalidateMe() {
super.invalidate(); super.invalidate();
for (Invalidatable i : invalidatables) { for (Invalidatable i : invalidatables) {
i.invalidate(); i.invalidateMe();
} }
} }

18
swing/src/net/sf/openrocket/gui/util/GUIUtil.java
View File

@ -589,7 +589,7 @@ public class GUIUtil {
SpinnerModel model = spinner.getModel(); SpinnerModel model = spinner.getModel();
spinner.setModel(new SpinnerNumberModel()); spinner.setModel(new SpinnerNumberModel());
if (model instanceof Invalidatable) { if (model instanceof Invalidatable) {
((Invalidatable) model).invalidate(); ((Invalidatable) model).invalidateMe();
} }
} else if (c instanceof JSlider) { } else if (c instanceof JSlider) {
@ -601,7 +601,7 @@ public class GUIUtil {
BoundedRangeModel model = slider.getModel(); BoundedRangeModel model = slider.getModel();
slider.setModel(new DefaultBoundedRangeModel()); slider.setModel(new DefaultBoundedRangeModel());
if (model instanceof Invalidatable) { if (model instanceof Invalidatable) {
((Invalidatable) model).invalidate(); ((Invalidatable) model).invalidateMe();
} }
} else if (c instanceof JComboBox) { } else if (c instanceof JComboBox) {
@ -613,7 +613,7 @@ public class GUIUtil {
ComboBoxModel<?> model = combo.getModel(); ComboBoxModel<?> model = combo.getModel();
combo.setModel(new DefaultComboBoxModel<Object>()); combo.setModel(new DefaultComboBoxModel<Object>());
if (model instanceof Invalidatable) { if (model instanceof Invalidatable) {
((Invalidatable) model).invalidate(); ((Invalidatable) model).invalidateMe();
} }
} else if (c instanceof AbstractButton) { } else if (c instanceof AbstractButton) {
@ -631,7 +631,7 @@ public class GUIUtil {
} }
}); });
if (model instanceof Invalidatable) { if (model instanceof Invalidatable) {
((Invalidatable) model).invalidate(); ((Invalidatable) model).invalidateMe();
} }
} else if (c instanceof JTable) { } else if (c instanceof JTable) {
@ -640,19 +640,19 @@ public class GUIUtil {
TableModel model1 = table.getModel(); TableModel model1 = table.getModel();
table.setModel(new DefaultTableModel()); table.setModel(new DefaultTableModel());
if (model1 instanceof Invalidatable) { if (model1 instanceof Invalidatable) {
((Invalidatable) model1).invalidate(); ((Invalidatable) model1).invalidateMe();
} }
TableColumnModel model2 = table.getColumnModel(); TableColumnModel model2 = table.getColumnModel();
table.setColumnModel(new DefaultTableColumnModel()); table.setColumnModel(new DefaultTableColumnModel());
if (model2 instanceof Invalidatable) { if (model2 instanceof Invalidatable) {
((Invalidatable) model2).invalidate(); ((Invalidatable) model2).invalidateMe();
} }
ListSelectionModel model3 = table.getSelectionModel(); ListSelectionModel model3 = table.getSelectionModel();
table.setSelectionModel(new DefaultListSelectionModel()); table.setSelectionModel(new DefaultListSelectionModel());
if (model3 instanceof Invalidatable) { if (model3 instanceof Invalidatable) {
((Invalidatable) model3).invalidate(); ((Invalidatable) model3).invalidateMe();
} }
} else if (c instanceof JTree) { } else if (c instanceof JTree) {
@ -661,13 +661,13 @@ public class GUIUtil {
TreeModel model1 = tree.getModel(); TreeModel model1 = tree.getModel();
tree.setModel(new DefaultTreeModel(new DefaultMutableTreeNode())); tree.setModel(new DefaultTreeModel(new DefaultMutableTreeNode()));
if (model1 instanceof Invalidatable) { if (model1 instanceof Invalidatable) {
((Invalidatable) model1).invalidate(); ((Invalidatable) model1).invalidateMe();
} }
TreeSelectionModel model2 = tree.getSelectionModel(); TreeSelectionModel model2 = tree.getSelectionModel();
tree.setSelectionModel(new DefaultTreeSelectionModel()); tree.setSelectionModel(new DefaultTreeSelectionModel());
if (model2 instanceof Invalidatable) { if (model2 instanceof Invalidatable) {
((Invalidatable) model2).invalidate(); ((Invalidatable) model2).invalidateMe();
} }
} else if (c instanceof Resettable) { } else if (c instanceof Resettable) {