Address some concerns/suggestions.

core/resources/l10n/messages.properties

@@ -536,7 +536,8 @@ simpanel.pop.plot = Plot / Export
 simpanel.pop.run = Run
 simpanel.pop.delete = Delete
 simpanel.pop.duplicate = Duplicate
-simpanel.pop.export_to_csv = Export table to csv file
+simpanel.pop.export_to_csv = Export table to CSV file
+simpanel.dlg.no.simulation.table.rows = Simulation table has no entries... run a simulation please
 simpanel.checkbox.donotask = Do not ask me again
 simpanel.lbl.defpref = You can change the default operation in the preferences.
 simpanel.dlg.lbl.DeleteSim1 = Delete the selected simulations?
@@ -1441,7 +1442,7 @@ main.menu.file.quit = Quit
 main.menu.file.quit.desc = Quit the program
 main.menu.file.exportDecal = Save decal image\u2026
 main.menu.file.exportDecal.desc = Save a decal from the current rocket design to a file for editing.
-main.menu.file.table.export_to_csv = Export sim table to csv file
+main.menu.file.table.export_to_csv = Export simulations table as CSV file
 
 main.menu.edit = Edit
 main.menu.edit.desc = Rocket editing

swing/src/net/sf/openrocket/gui/main/BasicFrame.java

@@ -573,10 +573,10 @@ public class BasicFrame extends JFrame {
 		exportSimTableToCSVMenuItem.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				exportSimulationTableToCSVAction();
+				exportSimulationTableToCSVAction(e);
 			}
 		});
-		exportSimTableToCSVMenuItem.setEnabled(simulationPanel.isReadyToExportSimTableToCSV());
+		exportSimTableToCSVMenuItem.setEnabled(simulationPanel.isReadyToExportSimTableToCSV(exportSimTableToCSVMenuItem));
 		menu.addSeparator();
 
 		////	Close
@@ -1441,8 +1441,8 @@ public class BasicFrame extends JFrame {
 	}
 	//	END ROCKSIM Export Action
 
-	public boolean exportSimulationTableToCSVAction() {
+	public boolean exportSimulationTableToCSVAction(ActionEvent e) {
-		simulationPanel.runExportSimTableToCSVAction();
+		simulationPanel.runExportSimTableToCSVAction(e);
 		return false;
 	}
 	/**

swing/src/net/sf/openrocket/gui/main/SimulationPanel.java

@@ -29,6 +29,7 @@ import javax.swing.JCheckBox;
 import javax.swing.JComponent;
 import javax.swing.JFileChooser;
 import javax.swing.JLabel;
+import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
@@ -83,6 +84,9 @@ import net.sf.openrocket.utils.TableRowTraversalPolicy;
 @SuppressWarnings("serial")
 public class SimulationPanel extends JPanel {
 
+	private static final String SPACE = "SPACE";
+	private static final String TAB = "TAB";
+
 	private static final Logger log = LoggerFactory.getLogger(SimulationPanel.class);
 	private static final Translator trans = Application.getTranslator();
 
@@ -116,6 +120,7 @@ public class SimulationPanel extends JPanel {
 	private final SimulationAction dumpSimulationTableAction;
 
 	private int[] previousSelection = null;
+	private JMenuItem exportSimTableToCSVMenuItem;
 
 	public SimulationPanel(OpenRocketDocument doc) {
 		super(new MigLayout("fill", "[grow][][][][][][grow]"));
@@ -247,6 +252,7 @@ public class SimulationPanel extends JPanel {
 				if ((simulationTable.getSelectedRow() != previousSelectedRow) ||
 						(simulationTable.getSelectedRowCount() != previousSelectedRowCount)) {
 					updateButtonStates();
+					updateMenuStates();
 					previousSelectedRow = simulationTable.getSelectedRow();
 					previousSelectedRowCount = simulationTable.getSelectedRowCount();
 				}
@@ -689,11 +695,29 @@ public class SimulationPanel extends JPanel {
 
 		@Override
 		public void actionPerformed(ActionEvent arg0) {
+			// one down side is that to change this means you have to export and save at least ONCE!
+			// there is no entry in the preferences to set this a-priori and it is default to a comma
+			String fieldSep = Application.getPreferences().getString(Preferences.EXPORT_FIELD_SEPARATOR, ",");
+			
+			if (fieldSep.equals(SPACE)) {
+				fieldSep = " ";
+			} else if (fieldSep.equals(TAB)) {
+				fieldSep = "\t";
+			}
+			Container tableParent = simulationTable.getParent();
 			int modelColumnCount = simulationTableModel.getColumnCount();
 			int modelRowCount = simulationTableModel.getRowCount();
+			
+			// I'm pretty sure with the enablement/disablement of the menu item under the File dropdown,
+			// that this would no longer be needed because if there is no sim table yet, the context menu
+			// won't show up.   But I'm going to leave this in just in case....
+			if (modelRowCount <= 0) {
+				String msg = trans.get("simpanel.dlg.no.simulation.table.rows");
+				JOptionPane.showMessageDialog(tableParent, msg);
+				return;
+			}
 
 			JFileChooser fch = this.setUpFileChooser();
-			Container tableParent = simulationTable.getParent();
 			int selectionStatus = fch.showOpenDialog(tableParent);
 			if (selectionStatus == JFileChooser.CANCEL_OPTION || selectionStatus == JFileChooser.ERROR_OPTION) {
 				return;  // cancel or error... nothing to do here
@@ -710,7 +734,7 @@ public class SimulationPanel extends JPanel {
 			}
 
 			// ONE difference here is that we'll place any warnings at the last cell in the csv.
-			csvSimResultString = StringUtils.join(rowColumnElement,",") + ", Simulation Warnings";
+			csvSimResultString = StringUtils.join(rowColumnElement,fieldSep) + fieldSep + "Simulation Warnings";
 
 			String fullOutputResult = csvSimResultString;
 			
@@ -754,10 +778,10 @@ public class SimulationPanel extends JPanel {
 				}
 				
 				// create the column data comma separated string for the ith row...
-				csvSimResultString = StringUtils.join(rowColumnElement, ",");
+				csvSimResultString = StringUtils.join(rowColumnElement, fieldSep);
 
 				// piece together all rows into one big ginourmous string, adding any warnings to the item
-				fullOutputResult += "\n" + csvSimResultString + "," + warningsText;
+				fullOutputResult += "\n" + csvSimResultString + fieldSep + warningsText;
 			}
 			
 			// dump the string to the file.
@@ -1193,19 +1217,37 @@ public class SimulationPanel extends JPanel {
 		}
 	}
 
-	public boolean isReadyToExportSimTableToCSV() {
+	public boolean isReadyToExportSimTableToCSV(JMenuItem exportSimTableToCSVMenuItem) {
-		// probably belt-n-suspenders to check for row/column count...
+		// This is the cheapest, dirtiest way I could think of to allow the activation/deactivation
-		File documentFile = document.getFile();
+		// of the export to csv action under the file menu.  With this, we can get activation of the
-		if (documentFile != null && simulationTableModel != null) {
+		// menu based upon the exitence of the table model PLUS one or more row in the table.
+		if (this.exportSimTableToCSVMenuItem == null && exportSimTableToCSVMenuItem != null) {
+			this.exportSimTableToCSVMenuItem = exportSimTableToCSVMenuItem;
+		}
+		
+		// an example being loaded will have file == null and simulationTableModel != null... likewise a new rocket
+		// will probably be the same... so this is probably belt-and-suspenders
+		if (/*documentFile != null ||*/ (simulationTableModel != null && simulationTableModel.getRowCount() > 0)) {
 			return true;
 		}
 		return false;
 	}
 
 	/**
-	 * Run the csv export action...
+	 * A menu state updater that is an analog to the button state updater.
 	 */
-	public void runExportSimTableToCSVAction() {
+	private void updateMenuStates() {
-		dumpSimulationTableAction.actionPerformed(null);
+		
+		// update the File->Export simulations table... menu entry
+		this.exportSimTableToCSVMenuItem.setEnabled(simulationTableModel != null && simulationTableModel.getRowCount() > 0);
+	}
+
+	/**
+	 * Run the csv export action...
+	 * @param e
+	 */
+	public void runExportSimTableToCSVAction(ActionEvent e) {
+
+		dumpSimulationTableAction.actionPerformed(e);
 	}
 }