X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Ffunction%2FPasteCoordinates.java;h=c9b2ad1c7ff3f74da6e8162fbb84d8fa886c1e42;hb=326f489e36aa7f235bc19409a57bf4955cd50f24;hp=1106001ad3f10abaec76c3b17a73f24d4ac543fd;hpb=1ee49ae3c8ef3aa2e63eadd458531e5f8bd4f92c;p=GpsPrune.git

diff --git a/tim/prune/function/PasteCoordinates.java b/tim/prune/function/PasteCoordinates.java
index 1106001..c9b2ad1 100644
--- a/tim/prune/function/PasteCoordinates.java
+++ b/tim/prune/function/PasteCoordinates.java
@@ -8,6 +8,7 @@ import java.awt.event.ActionListener;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 
 import javax.swing.BorderFactory;
 import javax.swing.JButton;
@@ -28,6 +29,8 @@ import tim.prune.data.DataPoint;
 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;
 
 /**
@@ -40,7 +43,7 @@ public class PasteCoordinates extends GenericFunction
 	private JTextField _nameField = null;
 	private JTextField _coordField = null;
 	private JButton _okButton = null;
-	private JComboBox _altUnitsDropDown;
+	private JComboBox<String> _altUnitsDropDown;
 
 
 	/**
@@ -74,8 +77,8 @@ public class PasteCoordinates extends GenericFunction
 		// 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);
 	}
@@ -96,12 +99,15 @@ public class PasteCoordinates extends GenericFunction
 		// Listeners to enable/disable ok button
 		KeyAdapter keyListener = new KeyAdapter() {
 			/** Key released */
-			public void keyReleased(KeyEvent arg0) {
+			public void keyReleased(KeyEvent inE) {
 				enableOK();
+				if (inE.getKeyCode() == KeyEvent.VK_ESCAPE) {
+					_dialog.dispose();
+				}
 			}
 		};
 		MouseAdapter mouseListener = new MouseAdapter() {
-			public void mouseReleased(java.awt.event.MouseEvent arg0) {
+			public void mouseReleased(MouseEvent inE) {
 				enableOK();
 			};
 		};
@@ -116,7 +122,7 @@ public class PasteCoordinates extends GenericFunction
 		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"));
@@ -132,7 +138,7 @@ public class PasteCoordinates extends GenericFunction
 		ActionListener okListener = new ActionListener() {
 			public void actionPerformed(ActionEvent e)
 			{
-				finish();
+				if (_okButton.isEnabled()) {finish();}
 			}
 		};
 		_okButton.addActionListener(okListener);
@@ -159,7 +165,7 @@ public class PasteCoordinates extends GenericFunction
 	private void enableOK()
 	{
 		String text = _coordField.getText();
-		_okButton.setEnabled(text != null && text.length() > 10
+		_okButton.setEnabled(text != null && text.length() > 6
 			&& (text.indexOf(' ') >= 0 || text.indexOf(',') >= 0));
 	}
 
@@ -232,9 +238,9 @@ public class PasteCoordinates extends GenericFunction
 		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: