diff --git a/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java b/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java index 71c3d6d36..1d9eb4650 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java +++ b/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java @@ -31,7 +31,8 @@ public class FlightConfiguration implements FlightConfigurableParameter { final public String key; - private final static String ERROR_CONFIGURATION_KEYTEXT = "j567uryk2489yfjbr8i1fi"; - private final static String DEFAULT_CONFIGURATION_KEYTEXT = "default_configuration_662002"; - private final static String DEFAULT_VALUE_KEYTEXT = "default_value_567866"; + private final static String ERROR_CONFIGURATION_KEYTEXT = "error_key_2489"; + private final static String DEFAULT_CONFIGURATION_KEYTEXT = "default_configuration_6602"; + private final static String DEFAULT_VALUE_KEYTEXT = "default_value_5676"; public final static FlightConfigurationID ERROR_CONFIGURATION_FCID = new FlightConfigurationID( FlightConfigurationID.ERROR_CONFIGURATION_KEYTEXT); public final static FlightConfigurationID DEFAULT_CONFIGURATION_FCID = new FlightConfigurationID( FlightConfigurationID.DEFAULT_CONFIGURATION_KEYTEXT ); diff --git a/core/src/net/sf/openrocket/rocketcomponent/FlightConfigurationSet.java b/core/src/net/sf/openrocket/rocketcomponent/FlightConfigurationSet.java index 322e5c02e..1a21e45fb 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/FlightConfigurationSet.java +++ b/core/src/net/sf/openrocket/rocketcomponent/FlightConfigurationSet.java @@ -219,14 +219,10 @@ public class FlightConfigurationSet> im System.err.println("====== Dumping ConfigurationSet for comp: '"+this.component.getName()+"' of type: "+this.component.getClass().getSimpleName()+" ======"); System.err.println(" >> FlightConfigurationSet ("+this.size()+ " configurations)"); - for( FlightConfigurationID loopFCID : this.map.keySet()){ + for( FlightConfigurationID loopFCID : this.getSortedConfigurationIDs()){ String shortKey = loopFCID.toShortKey(); - E inst = this.map.get(loopFCID); - if( this.isDefault(inst)){ - shortKey = "*"+shortKey+"*"; - } String designation; if( inst instanceof FlightConfiguration){ FlightConfiguration fc = (FlightConfiguration) inst; diff --git a/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/RenameConfigDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/RenameConfigDialog.java index 303aa54e6..11bdf4c9c 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/RenameConfigDialog.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/RenameConfigDialog.java @@ -22,15 +22,14 @@ public class RenameConfigDialog extends JDialog { private static final long serialVersionUID = -5423008694485357248L; private static final Translator trans = Application.getTranslator(); - public RenameConfigDialog(final Window parent, final Rocket rocket) { + public RenameConfigDialog(final Window parent, final Rocket rocket, final FlightConfigurationID fcid) { super(parent, trans.get("RenameConfigDialog.title"), Dialog.ModalityType.APPLICATION_MODAL); - final FlightConfigurationID configId = rocket.getDefaultConfiguration().getFlightConfigurationID(); JPanel panel = new JPanel(new MigLayout("fill")); panel.add(new JLabel(trans.get("RenameConfigDialog.lbl.name")), "span, wrap rel"); - final JTextField textbox = new JTextField(rocket.getFlightConfiguration(configId).getName()); + final JTextField textbox = new JTextField(rocket.getFlightConfiguration(fcid).getName()); panel.add(textbox, "span, w 200lp, growx, wrap para"); panel.add(new JPanel(), "growx"); @@ -40,24 +39,23 @@ public class RenameConfigDialog extends JDialog { @Override public void actionPerformed(ActionEvent e) { String newName = textbox.getText(); - - rocket.getFlightConfiguration(configId).setName( newName); + rocket.getFlightConfiguration(fcid).setName( newName); + System.err.println(" << just renamed: "+fcid.toShortKey()+" with: "+newName+" to: "+ rocket.getFlightConfiguration(fcid).getName()); + rocket.getConfigurationSet().printDebug(); RenameConfigDialog.this.setVisible(false); } }); panel.add(okButton); -// JButton renameToDefaultButton = new JButton(trans.get("RenameConfigDialog.but.reset")+" (in Devel: is this fixed yet?)"); -// renameToDefaultButton.addActionListener(new ActionListener() { -// @Override -// public void actionPerformed(ActionEvent e) { -// // why would I bother setting to null? -// System.err.println(" NYI: defaultButton (ln:55) in RenameConfigDialog... not sure what it's for..."); -// //rocket.getFlightConfiguration(configId).setName(null); -// RenameConfigDialog.this.setVisible(false); -// } -// }); -// panel.add(renameToDefaultButton); + JButton renameToDefaultButton = new JButton(trans.get("RenameConfigDialog.but.reset")); + renameToDefaultButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + rocket.getFlightConfiguration(fcid).setName(null); + RenameConfigDialog.this.setVisible(false); + } + }); + panel.add(renameToDefaultButton); JButton cancel = new JButton(trans.get("button.cancel")); cancel.addActionListener(new ActionListener() { diff --git a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurablePanel.java b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurablePanel.java index 2e7542218..f3db731c7 100644 --- a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurablePanel.java +++ b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurablePanel.java @@ -155,18 +155,17 @@ public abstract class FlightConfigurablePanel selectedComponent = (Pair) tableValue; - return selectedComponent.getU(); - } else if ( tableValue instanceof String ){ - // DEPRECATED - System.err.println(" found String instance where expected a Pair....Bug!"); - throw new IllegalStateException("!!Found String instance where expected a Pair....Bug!"); - // this really should be un-implemented. - //return new FlightConfigurationID((String) tableValue); + FlightConfigurationID fcid = selectedComponent.getU(); + return fcid; + } else if ( tableValue instanceof FlightConfigurationID ){ + return (FlightConfigurationID) tableValue; } return FlightConfigurationID.ERROR_CONFIGURATION_FCID; } protected abstract class FlightConfigurableCellRenderer extends DefaultTableCellRenderer { + private static final long serialVersionUID = 2026945220957913776L; + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { Component c = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); diff --git a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurationPanel.java b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurationPanel.java index e22b3f60b..346ab3d8d 100644 --- a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurationPanel.java +++ b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurationPanel.java @@ -156,11 +156,12 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe } private void renameConfiguration() { - new RenameConfigDialog(SwingUtilities.getWindowAncestor(this), rocket).setVisible(true); + FlightConfigurationID currentId = this.motorConfigurationPanel.getSelectedConfigurationId(); + new RenameConfigDialog(SwingUtilities.getWindowAncestor(this), rocket, currentId).setVisible(true); } private void removeConfiguration() { - FlightConfigurationID currentId = rocket.getDefaultConfiguration().getFlightConfigurationID(); + FlightConfigurationID currentId = this.motorConfigurationPanel.getSelectedConfigurationId(); if (currentId == null) return; document.removeFlightConfigurationAndSimulations(currentId);