Index: trunk/src/org/openstreetmap/josm/gui/MapFrame.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapFrame.java	(revision 5033)
+++ trunk/src/org/openstreetmap/josm/gui/MapFrame.java	(revision 5034)
@@ -101,5 +101,5 @@
     public SelectionListDialog selectionListDialog;
     public PropertiesDialog propertiesDialog;
-    
+
     /**
      * The panel list of all toggle dialog icons. To add new toggle dialog actions, use addToggleDialog
@@ -110,8 +110,8 @@
 
     public final ButtonGroup toolGroup = new ButtonGroup();
-    
+
     private List<IconToggleButton> allDialogButtons = new ArrayList<IconToggleButton>();
     private List<IconToggleButton> allMapModeButtons = new ArrayList<IconToggleButton>();
-    
+
     private final ListAllButtonsAction listAllDialogsAction = new ListAllButtonsAction(allDialogButtons);
     private final ListAllButtonsAction listAllMapModesAction = new ListAllButtonsAction(allMapModeButtons);
@@ -361,5 +361,5 @@
         listAllMapModesButton.setFont(listAllMapModesButton.getFont().deriveFont(Font.PLAIN));
         jb.add(listAllMapModesButton);
-        
+
         if(Main.pref.getBoolean("sidetoolbar.togglevisible", true)) {
             jb.addSeparator(new Dimension(0,18));
@@ -414,6 +414,6 @@
         private JButton button;
         private Collection<? extends HideableButton> buttons;
-        
-                
+
+
         public ListAllButtonsAction(Collection<? extends HideableButton> buttons) {
             this.buttons = buttons;
@@ -459,9 +459,9 @@
         toolBarToggle.repaint();
         for (IconToggleButton b : allMapModeButtons) {
-             b.applyButtonHiddenPreferences();
+            b.applyButtonHiddenPreferences();
         }
         toolBarActions.repaint();
     }
-    
+
     /**
      * Replies the instance of a toggle dialog of type <code>type</code> managed by this
@@ -540,6 +540,6 @@
         // invalidate repaint cache
         Main.map.mapView.preferenceChanged(null);
-        
-        // After all listeners notice new layer, some buttons will be disabled/enabled 
+
+        // After all listeners notice new layer, some buttons will be disabled/enabled
         // and possibly need to be hidden/shown.
         SwingUtilities.invokeLater(new Runnable() {
@@ -549,5 +549,5 @@
         });
     }
-    
+
 
     private MapMode getLastMapMode(Layer newLayer) {
@@ -556,5 +556,5 @@
             // if no action is selected - try to select default action
             Action defaultMode = getDefaultButtonAction();
-            if (defaultMode instanceof MapMode & ((MapMode)defaultMode).layerIsSupported(newLayer)) {
+            if (defaultMode instanceof MapMode && ((MapMode)defaultMode).layerIsSupported(newLayer)) {
                 mode = (MapMode) defaultMode;
             }