DGP - Bug fix for simulation dialog layout issue on Mac OS X; Components were being...

[debian/openrocket] / src / net / sf / openrocket / gui / main / SimulationEditDialog.java

diff --git a/src/net/sf/openrocket/gui/main/SimulationEditDialog.java b/src/net/sf/openrocket/gui/main/SimulationEditDialog.java
index 00591c9462ac14d29fecfa2c0897a2ee022a56c2..2b5ca7e7c4497810de2c0100402af8cce17da763 100644 (file)
--- a/src/net/sf/openrocket/gui/main/SimulationEditDialog.java
+++ b/src/net/sf/openrocket/gui/main/SimulationEditDialog.java
@@ -43,6 +43,8 @@ import net.sf.openrocket.gui.components.UnitSelector;
 import net.sf.openrocket.gui.plot.Axis;
 import net.sf.openrocket.gui.plot.PlotConfiguration;
 import net.sf.openrocket.gui.plot.SimulationPlotPanel;
+import net.sf.openrocket.gui.util.GUIUtil;
+import net.sf.openrocket.gui.util.Icons;
 import net.sf.openrocket.l10n.Translator;
 import net.sf.openrocket.models.atmosphere.ExtendedISAModel;
 import net.sf.openrocket.rocketcomponent.Configuration;
@@ -57,10 +59,7 @@ import net.sf.openrocket.startup.Application;
 import net.sf.openrocket.unit.Unit;
 import net.sf.openrocket.unit.UnitGroup;
 import net.sf.openrocket.util.Chars;
-import net.sf.openrocket.util.GUIUtil;
 import net.sf.openrocket.util.GeodeticComputationStrategy;
-import net.sf.openrocket.util.Icons;
-import net.sf.openrocket.util.Prefs;
 
 import org.jfree.chart.ChartFactory;
 import org.jfree.chart.ChartPanel;
@@ -88,8 +87,6 @@ public class SimulationEditDialog extends JDialog {
        private static final Translator trans = Application.getTranslator();
        
        
-       // FIXME: NPE if FlightDataType has disappeared
-       
        public SimulationEditDialog(Window parent, Simulation s) {
                this(parent, s, 0);
        }
@@ -613,11 +610,11 @@ public class SimulationEditDialog extends JDialog {
                                "[grow][65lp!][30lp!][75lp!]", ""));
                //// Simulator options
                sub.setBorder(BorderFactory.createTitledBorder(trans.get("simedtdlg.border.Simopt")));
-               panel.add(sub, "w 330lp!, growy, aligny 0");
+               panel.add(sub, "growx, growy, aligny 0");
                
 
                // Separate panel for computation methods, as they use a different layout
-               subsub = new JPanel(new MigLayout("fill"));
+               subsub = new JPanel(new MigLayout("insets 0, fill"));
                
 
                //// Calculation method:
@@ -743,7 +740,7 @@ public class SimulationEditDialog extends JDialog {
                button.addActionListener(new ActionListener() {
                        @Override
                        public void actionPerformed(ActionEvent e) {
-                               String previous = Prefs.NODE.get("previousListenerName", "");
+                               String previous = Application.getPreferences().getString("previousListenerName", "");
                                String input = (String) JOptionPane.showInputDialog(SimulationEditDialog.this,
                                                new Object[] {
                                                                //// Type the full Java class name of the simulation listener, for example:
@@ -758,7 +755,7 @@ public class SimulationEditDialog extends JDialog {
                                if (input == null || input.equals(""))
                                        return;
                                
-                               Prefs.NODE.put("previousListenerName", input);
+                               Application.getPreferences().putString("previousListenerName", input);
                                simulation.getSimulationListeners().add(input);
                                listenerModel.fireContentsChanged();
                        }