Move net.sf.openrocket.util.Prefs to net.sf.openrocket.gui.util.SwingPreferences.

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

diff --git a/src/net/sf/openrocket/gui/main/SimulationRunDialog.java b/src/net/sf/openrocket/gui/main/SimulationRunDialog.java
index 4405bdb50d622d18b98c29ed87db1edc7544fe86..63248f531ce19dd78c5687130cdb1708c53f341c 100644 (file)
--- a/src/net/sf/openrocket/gui/main/SimulationRunDialog.java
+++ b/src/net/sf/openrocket/gui/main/SimulationRunDialog.java
@@ -8,8 +8,6 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.io.CharArrayWriter;
-import java.io.PrintWriter;
 import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
@@ -25,6 +23,8 @@ import javax.swing.JProgressBar;
 import net.miginfocom.swing.MigLayout;
 import net.sf.openrocket.document.Simulation;
 import net.sf.openrocket.gui.dialogs.DetailDialog;
+import net.sf.openrocket.gui.util.GUIUtil;
+import net.sf.openrocket.gui.util.SwingPreferences;
 import net.sf.openrocket.l10n.Translator;
 import net.sf.openrocket.logging.LogHelper;
 import net.sf.openrocket.rocketcomponent.Configuration;
@@ -40,9 +40,7 @@ import net.sf.openrocket.simulation.listeners.SimulationListener;
 import net.sf.openrocket.startup.Application;
 import net.sf.openrocket.unit.Unit;
 import net.sf.openrocket.unit.UnitGroup;
-import net.sf.openrocket.util.GUIUtil;
 import net.sf.openrocket.util.MathUtil;
-import net.sf.openrocket.util.Prefs;
 
 
 public class SimulationRunDialog extends JDialog {
@@ -65,7 +63,7 @@ public class SimulationRunDialog extends JDialog {
         * dialogs to run in parallel, ie. they both have their own executor service.
         */
        private final ExecutorService executor = Executors.newFixedThreadPool(
-                       Prefs.getMaxThreadCount());
+                       SwingPreferences.getMaxThreadCount());
        
 
        private final JLabel simLabel, timeLabel, altLabel, velLabel;
@@ -125,7 +123,7 @@ public class SimulationRunDialog extends JDialog {
                //// Simulation time: 
                panel.add(new JLabel(trans.get("SimuRunDlg.lbl.Simutime") + " "), "gapright para");
                timeLabel = new JLabel("");
-               panel.add(timeLabel, "growx, wrap rel");
+               panel.add(timeLabel, "growx, wmin 200lp, wrap rel");
                
                //// Altitude:
                panel.add(new JLabel(trans.get("SimuRunDlg.lbl.Altitude") + " "));
@@ -382,12 +380,6 @@ public class SimulationRunDialog extends JDialog {
                                return; // Ignore cancellations
                        }
                        
-                       // Retrieve the stack trace in a textual form
-                       CharArrayWriter arrayWriter = new CharArrayWriter();
-                       arrayWriter.append(t.toString() + "\n" + "\n");
-                       t.printStackTrace(new PrintWriter(arrayWriter));
-                       String stackTrace = arrayWriter.toString();
-                       
                        // Analyze the exception type
                        if (t instanceof SimulationLaunchException) {
                                
@@ -407,7 +399,7 @@ public class SimulationRunDialog extends JDialog {
                                                                trans.get("SimuRunDlg.msg.errorOccurred"),
                                                                t.getMessage()
                                                },
-                                               stackTrace, simulation.getName(), JOptionPane.ERROR_MESSAGE);
+                                               null, simulation.getName(), JOptionPane.ERROR_MESSAGE);
                                
                        } else {