Numerous bug fixes and updates

[debian/openrocket] / src / net / sf / openrocket / gui / configdialog / FreeformFinSetConfig.java

diff --git a/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java b/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java
index de59d7a10a4d4a11503c2174f9f017c06bfabda7..18b18032aee09a0f0f619f19c24e7b762ac25296 100644 (file)
--- a/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java
+++ b/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java
@@ -17,19 +17,20 @@ import javax.swing.SwingConstants;
 import javax.swing.table.AbstractTableModel;
 
 import net.miginfocom.swing.MigLayout;
-import net.sf.openrocket.gui.BasicSlider;
-import net.sf.openrocket.gui.ResizeLabel;
 import net.sf.openrocket.gui.SpinnerEditor;
-import net.sf.openrocket.gui.UnitSelector;
 import net.sf.openrocket.gui.adaptors.DoubleModel;
 import net.sf.openrocket.gui.adaptors.EnumModel;
 import net.sf.openrocket.gui.adaptors.IntegerModel;
+import net.sf.openrocket.gui.components.BasicSlider;
+import net.sf.openrocket.gui.components.ResizeLabel;
+import net.sf.openrocket.gui.components.UnitSelector;
 import net.sf.openrocket.gui.scalefigure.FinPointFigure;
 import net.sf.openrocket.gui.scalefigure.ScaleScrollPane;
 import net.sf.openrocket.gui.scalefigure.ScaleSelector;
 import net.sf.openrocket.material.Material;
 import net.sf.openrocket.rocketcomponent.FinSet;
 import net.sf.openrocket.rocketcomponent.FreeformFinSet;
+import net.sf.openrocket.rocketcomponent.IllegalFinPointException;
 import net.sf.openrocket.rocketcomponent.RocketComponent;
 import net.sf.openrocket.unit.UnitGroup;
 import net.sf.openrocket.util.Coordinate;
@@ -208,7 +209,7 @@ public class FreeformFinSetConfig extends FinSetConfig {
 //             panel.add(new JLabel("    View:"), "wrap, aligny bottom");
                
                
-               panel.add(tablePane,"growy, width :100lp:, height 100lp:250lp:");
+               panel.add(tablePane,"growy, width 100lp:100lp:, height 100lp:250lp:");
                panel.add(figurePane,"gap unrel, spanx, growx, growy 1000, height 100lp:250lp:, wrap");
                
                panel.add(new ResizeLabel("Double-click", -2), "alignx 50%");
@@ -275,7 +276,7 @@ public class FreeformFinSetConfig extends FinSetConfig {
                                finset.addPoint(index);
                                try {
                                        finset.setPoint(index, point.x, point.y);
-                               } catch (IllegalArgumentException ignore) { }
+                               } catch (IllegalFinPointException ignore) { }
                                dragIndex = index;
                                
                                return;
@@ -299,7 +300,7 @@ public class FreeformFinSetConfig extends FinSetConfig {
                        
                        try {
                                finset.setPoint(dragIndex, point.x, point.y);
-                       } catch (IllegalArgumentException ignore) {
+                       } catch (IllegalFinPointException ignore) {
                                System.out.println("IAE:"+ignore);
                        }
                }
@@ -328,7 +329,7 @@ public class FreeformFinSetConfig extends FinSetConfig {
 
                        try {
                                finset.removePoint(index);
-                       } catch (IllegalArgumentException ignore) {
+                       } catch (IllegalFinPointException ignore) {
                        }
                }
                
@@ -462,6 +463,7 @@ public class FreeformFinSetConfig extends FinSetConfig {
                                finset.setPoint(rowIndex, c.x, c.y);
                        
                        } catch (NumberFormatException ignore) {
+                       } catch (IllegalFinPointException ignore) {
                        }
                }