X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gui%2Fcom%2Fbillkuker%2Frocketry%2Fmotorsim%2Fvisual%2Fworkbench%2FMotorEditor.java;h=c71e2fdbdcc6074d22749fc55161c97164963744;hb=0ccf63cf496d22cbd99d6604d2c883d3d2e2a632;hp=9264cf209fcadcda0113524b08c2ac9c116b63c8;hpb=f91161aeff9efac4ce90d9cf043185e555491b67;p=sw%2Fmotorsim

diff --git a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
index 9264cf2..c71e2fd 100644
--- a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
+++ b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
@@ -58,6 +58,7 @@ import com.billkuker.rocketry.motorsim.grain.Moonburner;
 import com.billkuker.rocketry.motorsim.grain.MultiGrain;
 import com.billkuker.rocketry.motorsim.grain.MultiPort;
 import com.billkuker.rocketry.motorsim.grain.RodAndTubeGrain;
+import com.billkuker.rocketry.motorsim.grain.Square;
 import com.billkuker.rocketry.motorsim.grain.Star;
 import com.billkuker.rocketry.motorsim.visual.BurnPanel;
 import com.billkuker.rocketry.motorsim.visual.ClassChooser;
@@ -76,6 +77,7 @@ public class MotorEditor extends JPanel implements PropertyChangeListener, FuelR
 	SummaryPanel sp;
 	JTextArea error;
 	JTabbedPane tabs;
+	boolean closed = false;
 
 	private Vector<BurnWatcher> burnWatchers = new Vector<BurnWatcher>();
 	private DefaultComboBoxModel availableFuels = new DefaultComboBoxModel();
@@ -120,6 +122,7 @@ public class MotorEditor extends JPanel implements PropertyChangeListener, FuelR
 		grainTypes.add(CSlot.class);
 		grainTypes.add(EndBurner.class);
 		grainTypes.add(MultiPort.class);
+		grainTypes.add(Square.class);
 	}
 	
 	private List<Class<? extends Chamber>> chamberTypes = new Vector<Class<? extends Chamber>>();
@@ -169,6 +172,11 @@ public class MotorEditor extends JPanel implements PropertyChangeListener, FuelR
 									@Override
 									public void setProgress(float f) {
 										if ( currentThread != me ){
+											log.info("Cancel burn on change");
+											throw new BurnCanceled();
+										}
+										if ( closed ){
+											log.info("Cancel burn on close");
 											throw new BurnCanceled();
 										}
 									}
@@ -378,7 +386,7 @@ public class MotorEditor extends JPanel implements PropertyChangeListener, FuelR
 						@Override
 						public void actionPerformed(ActionEvent e) {
 							motor.setFuel((Fuel)getSelectedItem());
-							System.out.println("FUEL CHANGED");
+							log.debug("FUEL CHANGED");
 						}});
 				}
 			});