Index: applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java
===================================================================
--- applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java	(revision 23189)
+++ applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java	(revision 23192)
@@ -28,158 +28,158 @@
 public class AlignWaysMode extends MapMode /* implements MapViewPaintable */{
 
-	private static final long serialVersionUID = -1090955708412011141L;
-	private final AlignWaysState noneSelected;
-	private final AlignWaysState referenceSelected;
-	private final AlignWaysState aligneeSelected;
-	private final AlignWaysState bothSelected;
-	private AlignWaysState currentState;
-	private AlignWaysSegmentMgr awSegs;
-	boolean tipShown;
+    private static final long serialVersionUID = -1090955708412011141L;
+    private final AlignWaysState noneSelected;
+    private final AlignWaysState referenceSelected;
+    private final AlignWaysState aligneeSelected;
+    private final AlignWaysState bothSelected;
+    private AlignWaysState currentState;
+    private AlignWaysSegmentMgr awSegs;
+    boolean tipShown;
 
-	public AlignWaysMode(MapFrame mapFrame, String name, String desc) {
-		super(tr(name), "alignways.png", tr(desc),
-				Shortcut.registerShortcut("mapmode:alignways",
-						tr("Mode: {0}", tr("Align Ways")),
-						KeyEvent.VK_N, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT),
-						mapFrame, Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
-		noneSelected = new AlignWaysSelNoneState();
-		referenceSelected = new AlignWaysSelRefState();
-		aligneeSelected = new AlignWaysSelAlgnState();
-		bothSelected = new AlignWaysSelBothState();
-		tipShown = false;
+    public AlignWaysMode(MapFrame mapFrame, String name, String desc) {
+        super(tr(name), "alignways.png", tr(desc),
+                Shortcut.registerShortcut("mapmode:alignways",
+                        tr("Mode: {0}", tr("Align Ways")),
+                        KeyEvent.VK_N, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT),
+                        mapFrame, Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+        noneSelected = new AlignWaysSelNoneState();
+        referenceSelected = new AlignWaysSelRefState();
+        aligneeSelected = new AlignWaysSelAlgnState();
+        bothSelected = new AlignWaysSelBothState();
+        tipShown = false;
 
-	}
+    }
 
-	@Override
-	public void enterMode() {
-		super.enterMode();
-		boolean showTips = Boolean.parseBoolean(Main.pref.get("alignways.showtips", "true"));
-		if ((showTips) && (!tipShown)) {
-			showTips();
-		}
-		awSegs = AlignWaysSegmentMgr.getInstance(Main.map.mapView);
-		Main.map.mapView.addMouseListener(this);
-		setCurrentState(noneSelected);
-	}
+    @Override
+    public void enterMode() {
+        super.enterMode();
+        boolean showTips = Boolean.parseBoolean(Main.pref.get("alignways.showtips", "true"));
+        if ((showTips) && (!tipShown)) {
+            showTips();
+        }
+        awSegs = AlignWaysSegmentMgr.getInstance(Main.map.mapView);
+        Main.map.mapView.addMouseListener(this);
+        setCurrentState(noneSelected);
+    }
 
-	@Override
-	public void exitMode() {
-		super.exitMode();
-		setCurrentState(noneSelected);
-		Main.map.mapView.removeMouseListener(this);
-		AlignWaysPlugin.getAwAction().setEnabled(false);
-	}
+    @Override
+    public void exitMode() {
+        super.exitMode();
+        setCurrentState(noneSelected);
+        Main.map.mapView.removeMouseListener(this);
+        AlignWaysPlugin.getAwAction().setEnabled(false);
+    }
 
-	@Override
-	public void mouseClicked(MouseEvent e) {
+    @Override
+    public void mouseClicked(MouseEvent e) {
 
-		boolean ctrlPressed = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
-		boolean altPressed = (e.getModifiers() & (ActionEvent.ALT_MASK | InputEvent.ALT_GRAPH_MASK)) != 0;
+        boolean ctrlPressed = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
+        boolean altPressed = (e.getModifiers() & (ActionEvent.ALT_MASK | InputEvent.ALT_GRAPH_MASK)) != 0;
 
-		if (e.getButton() == MouseEvent.BUTTON1) {
+        if (e.getButton() == MouseEvent.BUTTON1) {
 
-			if (altPressed) {
-				currentState.altLClick(this);
+            if (altPressed) {
+                currentState.altLClick(this);
 
-			} else {
-				Point clickedPoint = new Point(e.getX(), e.getY());
+            } else {
+                Point clickedPoint = new Point(e.getX(), e.getY());
 
-				if (!ctrlPressed) {
-					// Alignee could change
+                if (!ctrlPressed) {
+                    // Alignee could change
 
-					if (awSegs.algnUpdate(clickedPoint)) {
-						currentState.leftClick(this);
-					}
+                    if (awSegs.algnUpdate(clickedPoint)) {
+                        currentState.leftClick(this);
+                    }
 
-				} else {
-					// Reference could change
-					if (awSegs.refUpdate(clickedPoint)) {
-						currentState.ctrlLClick(this);
-					}
-				}
-			}
-		}
+                } else {
+                    // Reference could change
+                    if (awSegs.refUpdate(clickedPoint)) {
+                        currentState.ctrlLClick(this);
+                    }
+                }
+            }
+        }
 
-		// Activate the Align Ways button if we have enough selections
-		if (currentState == bothSelected) {
-			AlignWaysPlugin.getAwAction().setEnabled(true);
-		} else {
-			AlignWaysPlugin.getAwAction().setEnabled(false);
-		}
-		Main.map.mapView.repaint();
-	}
+        // Activate the Align Ways button if we have enough selections
+        if (currentState == bothSelected) {
+            AlignWaysPlugin.getAwAction().setEnabled(true);
+        } else {
+            AlignWaysPlugin.getAwAction().setEnabled(false);
+        }
+        Main.map.mapView.repaint();
+    }
 
-	/**
-	 * @param currentState
-	 *            One of the AlignWays states
-	 */
-	public void setCurrentState(AlignWaysState currentState) {
-		this.currentState = currentState;
-		currentState.setHelpText();
+    /**
+     * @param currentState
+     *            One of the AlignWays states
+     */
+    public void setCurrentState(AlignWaysState currentState) {
+        this.currentState = currentState;
+        currentState.setHelpText();
 
-		if (currentState == noneSelected) {
-			awSegs.cleanupWays();
-			// FIX: getCurrentDataSet may return null when the editable layer had
-			// already been removed by JOSM. This happens e.g. when the user closes
-			// JOSM while AlignWays mode is still active.
-			if (getCurrentDataSet() != null) {
-				getCurrentDataSet().clearSelection();
-			}
-		}
-	}
+        if (currentState == noneSelected) {
+            awSegs.cleanupWays();
+            // FIX: getCurrentDataSet may return null when the editable layer had
+            // already been removed by JOSM. This happens e.g. when the user closes
+            // JOSM while AlignWays mode is still active.
+            if (getCurrentDataSet() != null) {
+                getCurrentDataSet().clearSelection();
+            }
+        }
+    }
 
-	/**
-	 * @return the noneSelected
-	 */
-	public AlignWaysState getNoneSelected() {
-		return noneSelected;
-	}
+    /**
+     * @return the noneSelected
+     */
+    public AlignWaysState getNoneSelected() {
+        return noneSelected;
+    }
 
-	/**
-	 * @return the referenceSelected
-	 */
-	public AlignWaysState getReferenceSelected() {
-		return referenceSelected;
-	}
+    /**
+     * @return the referenceSelected
+     */
+    public AlignWaysState getReferenceSelected() {
+        return referenceSelected;
+    }
 
-	/**
-	 * @return the aligneeSelected
-	 */
-	public AlignWaysState getAligneeSelected() {
-		return aligneeSelected;
-	}
+    /**
+     * @return the aligneeSelected
+     */
+    public AlignWaysState getAligneeSelected() {
+        return aligneeSelected;
+    }
 
-	/**
-	 * @return the bothSelected
-	 */
-	public AlignWaysState getBothSelected() {
-		return bothSelected;
-	}
+    /**
+     * @return the bothSelected
+     */
+    public AlignWaysState getBothSelected() {
+        return bothSelected;
+    }
 
-	/**
-	 * @return the current state
-	 */
-	public AlignWaysState getCurrentState() {
-		return currentState;
-	}
+    /**
+     * @return the current state
+     */
+    public AlignWaysState getCurrentState() {
+        return currentState;
+    }
 
-	private void showTips() {
+    private void showTips() {
 
-		AlignWaysTipsPanel atd = new AlignWaysTipsPanel();
-		Object[] okButton = {tr("I''m ready!")};
-		JOptionPane tipPane = new JOptionPane(atd, JOptionPane.PLAIN_MESSAGE, JOptionPane.DEFAULT_OPTION, null, okButton, okButton[0]);
-		// JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
-		// Take Main.map as frame as it's better to inherit its icon than the default Java cup
-		JDialog tipDialog = tipPane.createDialog(Main.parent, tr("AlignWays Tips"));
-		// ((Frame)tipDialog.getOwner()).setIconImage(new ImageIcon(getClass().getResource("/images/blank.png")).getImage());
+        AlignWaysTipsPanel atd = new AlignWaysTipsPanel();
+        Object[] okButton = {tr("I''m ready!")};
+        JOptionPane tipPane = new JOptionPane(atd, JOptionPane.PLAIN_MESSAGE, JOptionPane.DEFAULT_OPTION, null, okButton, okButton[0]);
+        // JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+        // Take Main.map as frame as it's better to inherit its icon than the default Java cup
+        JDialog tipDialog = tipPane.createDialog(Main.parent, tr("AlignWays Tips"));
+        // ((Frame)tipDialog.getOwner()).setIconImage(new ImageIcon(getClass().getResource("/images/blank.png")).getImage());
 
-		tipDialog.setResizable(true);
-		tipDialog.setVisible(true);
-		tipShown = true;
+        tipDialog.setResizable(true);
+        tipDialog.setVisible(true);
+        tipShown = true;
 
-		tipDialog.dispose();
+        tipDialog.dispose();
 
-		Main.pref.put("alignways.showtips", !atd.isChkBoxSelected());
+        Main.pref.put("alignways.showtips", !atd.isChkBoxSelected());
 
-	}
+    }
 }