import tim.prune.data.Field;
import tim.prune.data.Latitude;
import tim.prune.data.Longitude;
+import tim.prune.data.Unit;
+import tim.prune.data.UnitSetLibrary;
import tim.prune.gui.GuiGridLayout;
/**
private JTextField _nameField = null;
private JTextField _coordField = null;
private JButton _okButton = null;
- private JComboBox _altUnitsDropDown;
+ private JComboBox<String> _altUnitsDropDown;
/**
// MAYBE: Paste clipboard into the edit field
_coordField.setText("");
_nameField.setText("");
- boolean metric = Config.getConfigBoolean(Config.KEY_METRIC_UNITS);
- _altUnitsDropDown.setSelectedIndex(metric?0:1);
+ boolean useMetres = (Config.getUnitSet().getAltitudeUnit() == UnitSetLibrary.UNITS_METRES);
+ _altUnitsDropDown.setSelectedIndex(useMetres?0:1);
enableOK();
_dialog.setVisible(true);
}
formatLabel.setHorizontalAlignment(SwingConstants.RIGHT);
grid.add(formatLabel);
final String[] altunits = {I18nManager.getText("units.metres"), I18nManager.getText("units.feet")};
- _altUnitsDropDown = new JComboBox(altunits);
+ _altUnitsDropDown = new JComboBox<String>(altunits);
grid.add(_altUnitsDropDown);
// Waypoint name
JLabel nameLabel = new JLabel(I18nManager.getText("dialog.pointnameedit.name"));
if (inValue3 != null)
{
// Look at altitude units dropdown
- final Altitude.Format altFormat = (_altUnitsDropDown.getSelectedIndex()==0?
- Altitude.Format.METRES:Altitude.Format.FEET);
- alt = new Altitude(inValue3, altFormat);
+ final Unit altUnit = (_altUnitsDropDown.getSelectedIndex()==0?
+ UnitSetLibrary.UNITS_METRES : UnitSetLibrary.UNITS_FEET);
+ alt = new Altitude(inValue3, altUnit);
if (!alt.isValid()) {alt = null;}
}
// See if value1 can be lat and value2 lon: