Added constants for the "Default Scale" name.

This commit is contained in:
Scotthew 2013-08-02 11:41:32 -07:00
parent 27f1996fd1
commit ae978c92d9
2 changed files with 12 additions and 5 deletions

View File

@ -131,6 +131,11 @@ public class Settings implements Serializable {
/* MDI Desktop Settings*/
public static int FRAME_OFFSET = 20;
/* Scale Settings */
public static String DEFAULT_SCALE = "Default";
public static String METRIC_SCALE = "Metric";
public static String STANDARD_SCALE = "Standard";
private static final String ISO15765 = "ISO15765";
private static final String ISO9141 = "ISO9141";
private static final String SYSTEM_NUMFORMAT = "system";

View File

@ -150,10 +150,12 @@ public class SettingsForm extends JFrame implements MouseListener {
chckbxOpenRomNode.setSelected(settings.isOpenExpanded());
chckbxOpenTablesAt.setSelected(settings.isAlwaysOpenTableAtZero());
if(settings.getDefaultScale().equalsIgnoreCase("Default")) {
comboBoxDefaultScale.setSelectedIndex(1);
} else if (settings.getDefaultScale().equalsIgnoreCase("Standard")) {
comboBoxDefaultScale.setSelectedIndex(2);
if(settings.getDefaultScale().equalsIgnoreCase(Settings.DEFAULT_SCALE)) {
comboBoxDefaultScale.setSelectedItem(Settings.DEFAULT_SCALE);
} else if (settings.getDefaultScale().equalsIgnoreCase(Settings.METRIC_SCALE)) {
comboBoxDefaultScale.setSelectedItem(Settings.METRIC_SCALE);
} else if (settings.getDefaultScale().equalsIgnoreCase(Settings.STANDARD_SCALE)) {
comboBoxDefaultScale.setSelectedItem(Settings.STANDARD_SCALE);
} else {
comboBoxDefaultScale.setSelectedIndex(0);
}
@ -460,7 +462,7 @@ public class SettingsForm extends JFrame implements MouseListener {
JLabel lblDefaultScale = new JLabel("Default Scale:");
comboBoxDefaultScale.setModel(new DefaultComboBoxModel(new String[] {"Metric", "Default", "Standard"}));
comboBoxDefaultScale.setModel(new DefaultComboBoxModel(new String[] { Settings.DEFAULT_SCALE, Settings.METRIC_SCALE, Settings.STANDARD_SCALE}));
GroupLayout gl_jPanelScale = new GroupLayout(jPanelScale);
gl_jPanelScale.setHorizontalGroup(
gl_jPanelScale.createParallelGroup(Alignment.LEADING)