hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up

Browse Source
This commit is contained in:
SiboVG 2022-07-20 10:36:28 +02:00
parent 1a3bbdaf78
commit d54a92051c
1 changed files with 97 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

192
swing/src/net/sf/openrocket/gui/preset/PresetEditorDialog.java
View File

@ -72,7 +72,7 @@ public class PresetEditorDialog extends JDialog implements ItemListener {
private static final long serialVersionUID = -3298642844886682536L; private static final long serialVersionUID = -3298642844886682536L;
private static Translator trans = Application.getTranslator(); private static final Translator trans = Application.getTranslator();
private static final Logger log = LoggerFactory.getLogger(PresetEditorDialog.class); private static final Logger log = LoggerFactory.getLogger(PresetEditorDialog.class);
@ -83,137 +83,136 @@ public class PresetEditorDialog extends JDialog implements ItemListener {
*/ */
final PresetInputVerifier NON_NEGATIVE_INTEGER = new PresetInputVerifier(Pattern.compile(NON_NEGATIVE_INTEGER_FIELD)); final PresetInputVerifier NON_NEGATIVE_INTEGER = new PresetInputVerifier(Pattern.compile(NON_NEGATIVE_INTEGER_FIELD));
private final JPanel contentPanel = new JPanel(); private final DeselectableComboBox<String> typeCombo;
private DeselectableComboBox<String> typeCombo; private final JTextField mfgTextField;
private JTextField mfgTextField; private final MaterialChooser materialChooser;
private MaterialChooser materialChooser;
private MaterialHolder holder = null; private MaterialHolder holder = null;
private JTextField ncPartNoTextField; private final JTextField ncPartNoTextField;
private JTextField ncDescTextField; private final JTextField ncDescTextField;
private DoubleModel ncLength; private final DoubleModel ncLength;
private JCheckBox ncFilledCB; private final JCheckBox ncFilledCB;
private JComboBox<String> ncShapeCB; private final JComboBox<String> ncShapeCB;
private DoubleModel ncAftDia; private final DoubleModel ncAftDia;
private DoubleModel ncAftShoulderDia; private final DoubleModel ncAftShoulderDia;
private DoubleModel ncAftShoulderLen; private final DoubleModel ncAftShoulderLen;
private DoubleModel ncMass; private final DoubleModel ncMass;
private ImageIcon ncImage; private ImageIcon ncImage;
private JButton ncImageBtn; private final JButton ncImageBtn;
private JTextField trPartNoTextField; private final JTextField trPartNoTextField;
private JTextField trDescTextField; private final JTextField trDescTextField;
private DoubleModel trLength; private final DoubleModel trLength;
private DoubleModel trAftDia; private final DoubleModel trAftDia;
private DoubleModel trAftShoulderDia; private final DoubleModel trAftShoulderDia;
private DoubleModel trAftShoulderLen; private final DoubleModel trAftShoulderLen;
private DoubleModel trForeDia; private final DoubleModel trForeDia;
private DoubleModel trForeShoulderDia; private final DoubleModel trForeShoulderDia;
private DoubleModel trForeShoulderLen; private final DoubleModel trForeShoulderLen;
private DoubleModel trMass; private DoubleModel trMass;
private ImageIcon trImage; private ImageIcon trImage;
private JCheckBox trFilledCB; private final JCheckBox trFilledCB;
private JComboBox<String> trShapeCB; private final JComboBox<String> trShapeCB;
private JButton trImageBtn; private final JButton trImageBtn;
private JTextField btPartNoTextField; private final JTextField btPartNoTextField;
private JTextField btDescTextField; private final JTextField btDescTextField;
private DoubleModel btMass; private final DoubleModel btMass;
private DoubleModel btInnerDia; private final DoubleModel btInnerDia;
private DoubleModel btOuterDia; private final DoubleModel btOuterDia;
private DoubleModel btLength; private final DoubleModel btLength;
private ImageIcon btImage; private ImageIcon btImage;
private JButton btImageBtn; private final JButton btImageBtn;
private JTextField tcPartNoTextField; private final JTextField tcPartNoTextField;
private JTextField tcDescTextField; private final JTextField tcDescTextField;
private DoubleModel tcMass; private final DoubleModel tcMass;
private DoubleModel tcInnerDia; private final DoubleModel tcInnerDia;
private DoubleModel tcOuterDia; private final DoubleModel tcOuterDia;
private DoubleModel tcLength; private final DoubleModel tcLength;
private ImageIcon tcImage; private ImageIcon tcImage;
private JButton tcImageBtn; private final JButton tcImageBtn;
private JTextField bhPartNoTextField; private final JTextField bhPartNoTextField;
private JTextField bhDescTextField; private final JTextField bhDescTextField;
private DoubleModel bhOuterDia; private final DoubleModel bhOuterDia;
private DoubleModel bhLength; private final DoubleModel bhLength;
private DoubleModel bhMass; private final DoubleModel bhMass;
private ImageIcon bhImage; private ImageIcon bhImage;
private JButton bhImageBtn; private final JButton bhImageBtn;
private JTextField crPartNoTextField; private final JTextField crPartNoTextField;
private JTextField crDescTextField; private final JTextField crDescTextField;
private DoubleModel crOuterDia; private final DoubleModel crOuterDia;
private DoubleModel crInnerDia; private final DoubleModel crInnerDia;
private DoubleModel crThickness; private final DoubleModel crThickness;
private DoubleModel crMass; private final DoubleModel crMass;
private ImageIcon crImage; private ImageIcon crImage;
private JButton crImageBtn; private final JButton crImageBtn;
private JTextField ebPartNoTextField; private final JTextField ebPartNoTextField;
private JTextField ebDescTextField; private final JTextField ebDescTextField;
private DoubleModel ebOuterDia; private final DoubleModel ebOuterDia;
private DoubleModel ebInnerDia; private final DoubleModel ebInnerDia;
private DoubleModel ebThickness; private final DoubleModel ebThickness;
private DoubleModel ebMass; private final DoubleModel ebMass;
private ImageIcon ebImage; private ImageIcon ebImage;
private JButton ebImageBtn; private final JButton ebImageBtn;
private JTextField llPartNoTextField; private final JTextField llPartNoTextField;
private JTextField llDescTextField; private final JTextField llDescTextField;
private DoubleModel llOuterDia; private final DoubleModel llOuterDia;
private DoubleModel llInnerDia; private final DoubleModel llInnerDia;
private DoubleModel llLength; private final DoubleModel llLength;
private DoubleModel llMass; private final DoubleModel llMass;
private ImageIcon llImage; private ImageIcon llImage;
private JButton llImageBtn; private final JButton llImageBtn;
private JTextField rbPartNoTextField; private final JTextField rbPartNoTextField;
private JTextField rbDescTextField; private final JTextField rbDescTextField;
private DoubleModel rbOuterDia; private final DoubleModel rbOuterDia;
private DoubleModel rbInnerDia; private final DoubleModel rbInnerDia;
private DoubleModel rbHeight; private final DoubleModel rbHeight;
private DoubleModel rbStandoffHeight; private final DoubleModel rbStandoffHeight;
private DoubleModel rbFlangeHeight; private final DoubleModel rbFlangeHeight;
private DoubleModel rbMass; private final DoubleModel rbMass;
private ImageIcon rbImage; private ImageIcon rbImage;
private JButton rbImageBtn; private final JButton rbImageBtn;
private JTextField stPartNoTextField; private final JTextField stPartNoTextField;
private JTextField stDescTextField; private final JTextField stDescTextField;
private DoubleModel stThickness; private final DoubleModel stThickness;
private DoubleModel stWidth; private final DoubleModel stWidth;
private DoubleModel stLength; private final DoubleModel stLength;
private DoubleModel stMass; private final DoubleModel stMass;
private ImageIcon stImage; private ImageIcon stImage;
private JButton stImageBtn; private final JButton stImageBtn;
// Parachute Specific // Parachute Specific
private JTextField pcPartNoTextField; private final JTextField pcPartNoTextField;
private JTextField pcDescTextField; private final JTextField pcDescTextField;
private DoubleModel pcDiameter; private final DoubleModel pcDiameter;
private DoubleModel pcSpillDia; private DoubleModel pcSpillDia;
private DoubleModel pcSurfaceArea; private DoubleModel pcSurfaceArea;
private DoubleModel pcDragCoefficient; private DoubleModel pcDragCoefficient;
// Canopy material = private MaterialChooser materialChooser; // Canopy material = private MaterialChooser materialChooser;
private JTextField pcSides; private final JTextField pcSides;
private JTextField pcLineCount; private final JTextField pcLineCount;
private DoubleModel pcLineLength; private final DoubleModel pcLineLength;
private DoubleModel pcPackedLength; private DoubleModel pcPackedLength;
private DoubleModel pcPackedDiameter; private DoubleModel pcPackedDiameter;
private MaterialChooser pcLineMaterialChooser; private final MaterialChooser pcLineMaterialChooser;
private DoubleModel pcMass; private final DoubleModel pcMass;
private ImageIcon pcImage; private ImageIcon pcImage;
private JButton pcImageBtn; private final JButton pcImageBtn;
private final JFileChooser imageChooser = createImageChooser(); private final JFileChooser imageChooser = createImageChooser();
private JPanel componentOverlayPanel; private final JPanel componentOverlayPanel;
private PresetResultListener resultListener; private final PresetResultListener resultListener;
private static Map<String, String> componentMap = new HashMap<String, String>(); private static final Map<String, String> componentMap = new HashMap<String, String>();
private static final String NOSE_CONE_KEY = "NoseCone.NoseCone"; private static final String NOSE_CONE_KEY = "NoseCone.NoseCone";
private static final String BODY_TUBE_KEY = "BodyTube.BodyTube"; private static final String BODY_TUBE_KEY = "BodyTube.BodyTube";
@ -263,6 +262,7 @@ public class PresetEditorDialog extends JDialog implements ItemListener {
getContentPane().setMinimumSize(new Dimension(200, 200)); getContentPane().setMinimumSize(new Dimension(200, 200));
setBounds(100, 100, 825, 610); setBounds(100, 100, 825, 610);
getContentPane().setLayout(new BorderLayout()); getContentPane().setLayout(new BorderLayout());
JPanel contentPanel = new JPanel();
contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
getContentPane().add(contentPanel, BorderLayout.CENTER); getContentPane().add(contentPanel, BorderLayout.CENTER);
contentPanel.setLayout(new MigLayout("", "[][grow][94.00,grow][232.0,grow][130.00][grow]", "[][][20.00,grow][grow]")); contentPanel.setLayout(new MigLayout("", "[][grow][94.00,grow][232.0,grow][130.00][grow]", "[][][20.00,grow][grow]"));