X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Ffunction%2FPasteCoordinates.java;h=c9b2ad1c7ff3f74da6e8162fbb84d8fa886c1e42;hb=326f489e36aa7f235bc19409a57bf4955cd50f24;hp=7587949b25c893e5a4c9565d69d6a723ae603ec2;hpb=4d5796d02a15808311c09448d79e6e7d1de9d636;p=GpsPrune.git

diff --git a/tim/prune/function/PasteCoordinates.java b/tim/prune/function/PasteCoordinates.java
index 7587949..c9b2ad1 100644
--- a/tim/prune/function/PasteCoordinates.java
+++ b/tim/prune/function/PasteCoordinates.java
@@ -29,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;
 
 /**
@@ -41,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;
 
 
 	/**
@@ -75,7 +77,7 @@ public class PasteCoordinates extends GenericFunction
 		// MAYBE: Paste clipboard into the edit field
 		_coordField.setText("");
 		_nameField.setText("");
-		boolean useMetres = (Config.getUnitSet().getDefaultAltitudeFormat() == Altitude.Format.METRES);
+		boolean useMetres = (Config.getUnitSet().getAltitudeUnit() == UnitSetLibrary.UNITS_METRES);
 		_altUnitsDropDown.setSelectedIndex(useMetres?0:1);
 		enableOK();
 		_dialog.setVisible(true);
@@ -120,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"));
@@ -236,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: