Index: applications/editors/josm/plugins/waypoints/src/WaypointOpenAction.java
===================================================================
--- applications/editors/josm/plugins/waypoints/src/WaypointOpenAction.java	(revision 12598)
+++ applications/editors/josm/plugins/waypoints/src/WaypointOpenAction.java	(revision 12778)
@@ -29,46 +29,46 @@
  */
 public class WaypointOpenAction extends DiskAccessAction {
-	
-	/**
-	 * Create an open action. The name is "Open a file".
-	 */
-	public WaypointOpenAction() {
-		super(tr("Open waypoints file"), "open", tr("Open a waypoints file."),
-		Shortcut.registerShortcut("tools:waypoints", tr("Menu: {0}",
-		tr("Open waypoints file")), KeyEvent.VK_W, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT));
-	}
+    
+    /**
+     * Create an open action. The name is "Open a file".
+     */
+    public WaypointOpenAction() {
+        super(tr("Open waypoints file"), "open", tr("Open a waypoints file."),
+        Shortcut.registerShortcut("tools:waypoints", tr("Menu: {0}",
+        tr("Open waypoints file")), KeyEvent.VK_W, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT));
+    }
 
-	public void actionPerformed(ActionEvent e) {
-		JFileChooser fc = createAndOpenFileChooser(true, true, null);
-		if (fc == null)
-			return;
-		File[] files = fc.getSelectedFiles();
-		for (int i = files.length; i > 0; --i)
-			openFile(files[i-1]);
-	}
+    public void actionPerformed(ActionEvent e) {
+        JFileChooser fc = createAndOpenFileChooser(true, true, null);
+        if (fc == null)
+            return;
+        File[] files = fc.getSelectedFiles();
+        for (int i = files.length; i > 0; --i)
+            openFile(files[i-1]);
+    }
 
-	/**
-	 * Open the given file.
-	 */
-	public void openFile(File file) {
-		String fn = file.getName();
-		try {
-				DataSet dataSet = 
-						WaypointReader.parse(new FileInputStream(file));
-				Main.main.addLayer(new OsmDataLayer(dataSet, file.getName(), 
-										file));
-		} catch (SAXException x) {
-			x.printStackTrace();
-			JOptionPane.showMessageDialog(Main.parent, 
-					tr("Error while parsing {0}",fn)+": "+x.getMessage());
-		} catch (ParserConfigurationException x) {
-			x.printStackTrace(); // broken SAXException chaining
-			JOptionPane.showMessageDialog(Main.parent, 
-					tr("Error while parsing {0}",fn)+": "+x.getMessage());
-		} catch (IOException x) {
-			x.printStackTrace();
-			JOptionPane.showMessageDialog(Main.parent, 
-					tr("Could not read \"{0}\"",fn)+"\n"+x.getMessage());
-		}
-	}
+    /**
+     * Open the given file.
+     */
+    public void openFile(File file) {
+        String fn = file.getName();
+        try {
+                DataSet dataSet = 
+                        WaypointReader.parse(new FileInputStream(file));
+                Main.main.addLayer(new OsmDataLayer(dataSet, file.getName(), 
+                                        file));
+        } catch (SAXException x) {
+            x.printStackTrace();
+            JOptionPane.showMessageDialog(Main.parent, 
+                    tr("Error while parsing {0}",fn)+": "+x.getMessage());
+        } catch (ParserConfigurationException x) {
+            x.printStackTrace(); // broken SAXException chaining
+            JOptionPane.showMessageDialog(Main.parent, 
+                    tr("Error while parsing {0}",fn)+": "+x.getMessage());
+        } catch (IOException x) {
+            x.printStackTrace();
+            JOptionPane.showMessageDialog(Main.parent, 
+                    tr("Could not read \"{0}\"",fn)+"\n"+x.getMessage());
+        }
+    }
 }
Index: applications/editors/josm/plugins/waypoints/src/WaypointPlugin.java
===================================================================
--- applications/editors/josm/plugins/waypoints/src/WaypointPlugin.java	(revision 12598)
+++ applications/editors/josm/plugins/waypoints/src/WaypointPlugin.java	(revision 12778)
@@ -11,19 +11,19 @@
 
 
-	public WaypointPlugin() {
-		JMenuItem waypointItem = new JMenuItem(new WaypointOpenAction());
-		int index = findFirstSeparator();
-		Main.main.menu.fileMenu.add(waypointItem,index<0 ? 0: index);
-	}
+    public WaypointPlugin() {
+        JMenuItem waypointItem = new JMenuItem(new WaypointOpenAction());
+        int index = findFirstSeparator();
+        Main.main.menu.fileMenu.add(waypointItem,index<0 ? 0: index);
+    }
 
-	private int findFirstSeparator()
-	{
-		Component[] components = Main.main.menu.fileMenu.getMenuComponents();
-		for(int count=0; count<components.length; count++)
-		{
-			if(components[count] instanceof JSeparator)
-				return count;
-		}
-		return -1;
-	}
+    private int findFirstSeparator()
+    {
+        Component[] components = Main.main.menu.fileMenu.getMenuComponents();
+        for(int count=0; count<components.length; count++)
+        {
+            if(components[count] instanceof JSeparator)
+                return count;
+        }
+        return -1;
+    }
 }
Index: applications/editors/josm/plugins/waypoints/src/WaypointReader.java
===================================================================
--- applications/editors/josm/plugins/waypoints/src/WaypointReader.java	(revision 12598)
+++ applications/editors/josm/plugins/waypoints/src/WaypointReader.java	(revision 12778)
@@ -1,3 +1,3 @@
-package waypoints; 
+package waypoints;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -23,86 +23,86 @@
 public class WaypointReader {
 
-	private static class Parser extends DefaultHandler {
-		/**
-		 * Current track to be read. The last entry is the current trkpt.
-		 * If in wpt-mode, it contain only one GpsPoint.
-		 */
-	    private DataSet dataSet;
-		private LatLon currentLatLon;
-		private String curWptName;
-		private  boolean inName = false;
+    private static class Parser extends DefaultHandler {
+        /**
+         * Current track to be read. The last entry is the current trkpt.
+         * If in wpt-mode, it contain only one GpsPoint.
+         */
+        private DataSet dataSet;
+        private LatLon currentLatLon;
+        private String curWptName;
+        private  boolean inName = false;
 
-		// NW start	
-		// data now has two components: the GPS points and an OsmDataLayer.
-		// This is to allow us to convert waypoints straight to nodes.
-		// The way this works is that waypoints with a name not beginning
-		// with 0 - i.e. waypoints specially named - will be loaded in as
-		// nodes, in addition to going into the gpx layer. Other waypoints will
-		// only go into the gpx layer.
-		public Parser()
-		{
-			dataSet = new DataSet();
-		}
-		// NW end
+        // NW start
+        // data now has two components: the GPS points and an OsmDataLayer.
+        // This is to allow us to convert waypoints straight to nodes.
+        // The way this works is that waypoints with a name not beginning
+        // with 0 - i.e. waypoints specially named - will be loaded in as
+        // nodes, in addition to going into the gpx layer. Other waypoints will
+        // only go into the gpx layer.
+        public Parser()
+        {
+            dataSet = new DataSet();
+        }
+        // NW end
 
-		@Override public void startElement(String namespaceURI, 
-				String localName, String qName, Attributes atts) 
-					throws SAXException {
-			if (qName.equals("wpt")) {
-				try {
-	                double lat = Double.parseDouble(atts.getValue("lat"));
-	                double lon = Double.parseDouble(atts.getValue("lon"));
-	        		if (Math.abs(lat) > 90)
-	        			throw new SAXException
-						(tr("Data error: lat value \"{0}\" is out of bound.", 
-							lat));
-	        		if (Math.abs(lon) > 180)
-	        			throw new SAXException
-						(tr("Data error: lon value \"{0}\" is out of bound.", 
-							lon));
-	                currentLatLon = new LatLon(lat, lon);
+        @Override public void startElement(String namespaceURI,
+                String localName, String qName, Attributes atts)
+                    throws SAXException {
+            if (qName.equals("wpt")) {
+                try {
+                    double lat = Double.parseDouble(atts.getValue("lat"));
+                    double lon = Double.parseDouble(atts.getValue("lon"));
+                    if (Math.abs(lat) > 90)
+                        throw new SAXException
+                        (tr("Data error: lat value \"{0}\" is out of bound.",
+                            lat));
+                    if (Math.abs(lon) > 180)
+                        throw new SAXException
+                        (tr("Data error: lon value \"{0}\" is out of bound.",
+                            lon));
+                    currentLatLon = new LatLon(lat, lon);
                 } catch (NumberFormatException e) {
-                	e.printStackTrace();
-	                throw new SAXException(e);
+                    e.printStackTrace();
+                    throw new SAXException(e);
                 }
-			}
-			else if (qName.equals("name")) {
-				inName = true;
-				curWptName = "";	
-			}	
-		}
+            }
+            else if (qName.equals("name")) {
+                inName = true;
+                curWptName = "";
+            }
+        }
 
-		@Override public void characters(char[] ch, int start, int length) {
-			// NW start
-			if (inName) {
-				curWptName = new String (ch,start,length);
-			}
-			// NW end
-		}
+        @Override public void characters(char[] ch, int start, int length) {
+            // NW start
+            if (inName) {
+                curWptName = new String (ch,start,length);
+            }
+            // NW end
+        }
 
-		@Override public void endElement(String namespaceURI, String localName,
-					   					String qName) {
-			if (qName.equals("wpt") && curWptName!="") { 
-				// create a new node from the latitude and longitude
-				System.out.println("Found a waypoint to convert to a node: " 
-										+ curWptName);
-				Node node = new Node(currentLatLon);
-				node.put("name",curWptName);
-				dataSet.nodes.add(node);
-			}
-			else if (qName.equals("name")) {
-				inName = false;
-			}
+        @Override public void endElement(String namespaceURI, String localName,
+                                        String qName) {
+            if (qName.equals("wpt") && curWptName!="") {
+                // create a new node from the latitude and longitude
+                System.out.println("Found a waypoint to convert to a node: "
+                                        + curWptName);
+                Node node = new Node(currentLatLon);
+                node.put("name",curWptName);
+                dataSet.nodes.add(node);
+            }
+            else if (qName.equals("name")) {
+                inName = false;
+            }
         }
-	}
+    }
 
-	/**
-	 * Parse and return the read data
-	 */
-	public static DataSet parse(InputStream source) 
-			throws SAXException, IOException, ParserConfigurationException {
-		Parser parser = new Parser();
-		SAXParserFactory.newInstance().newSAXParser().parse(new InputSource(new InputStreamReader(source, "UTF-8")), parser);
-		return parser.dataSet;
-	}
+    /**
+     * Parse and return the read data
+     */
+    public static DataSet parse(InputStream source)
+            throws SAXException, IOException, ParserConfigurationException {
+        Parser parser = new Parser();
+        SAXParserFactory.newInstance().newSAXParser().parse(new InputSource(new InputStreamReader(source, "UTF-8")), parser);
+        return parser.dataSet;
+    }
 }