projects
/
sw
/
motorsim
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stop processing a burn on motor close
[sw/motorsim]
/
gui
/
com
/
billkuker
/
rocketry
/
motorsim
/
visual
/
workbench
/
MotorEditor.java
diff --git
a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
index 3df2ceb9a4e2d4de87d55abcca5f5f340ccc9105..c71e2fdbdcc6074d22749fc55161c97164963744 100644
(file)
--- a/
gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
+++ b/
gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
@@
-77,6
+77,7
@@
public class MotorEditor extends JPanel implements PropertyChangeListener, FuelR
SummaryPanel sp;
\r
JTextArea error;
\r
JTabbedPane tabs;
\r
SummaryPanel sp;
\r
JTextArea error;
\r
JTabbedPane tabs;
\r
+ boolean closed = false;
\r
\r
private Vector<BurnWatcher> burnWatchers = new Vector<BurnWatcher>();
\r
private DefaultComboBoxModel availableFuels = new DefaultComboBoxModel();
\r
\r
private Vector<BurnWatcher> burnWatchers = new Vector<BurnWatcher>();
\r
private DefaultComboBoxModel availableFuels = new DefaultComboBoxModel();
\r
@@
-171,6
+172,11
@@
public class MotorEditor extends JPanel implements PropertyChangeListener, FuelR
@Override
\r
public void setProgress(float f) {
\r
if ( currentThread != me ){
\r
@Override
\r
public void setProgress(float f) {
\r
if ( currentThread != me ){
\r
+ log.info("Cancel burn on change");
\r
+ throw new BurnCanceled();
\r
+ }
\r
+ if ( closed ){
\r
+ log.info("Cancel burn on close");
\r
throw new BurnCanceled();
\r
}
\r
}
\r
throw new BurnCanceled();
\r
}
\r
}
\r