Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java	(revision 3661)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java	(revision 3662)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.dialogs;
 
@@ -35,5 +36,4 @@
 import javax.swing.ListSelectionModel;
 import javax.swing.UIManager;
-import javax.swing.event.ListDataEvent;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
@@ -203,4 +203,5 @@
         model.addLayerListModelListener(
                 new LayerListModelListener() {
+                    @Override
                     public void makeVisible(int row, Layer layer) {
                         System.err.println(Thread.currentThread());
@@ -208,4 +209,5 @@
                         layerList.repaint();
                     }
+                    @Override
                     public void refresh() {
                         layerList.repaint();
@@ -249,4 +251,5 @@
         listSelectionModel.addListSelectionListener(
                 new ListSelectionListener() {
+                    @Override
                     public void valueChanged(ListSelectionEvent e) {
                         listener.updateEnabledState();
@@ -324,4 +327,5 @@
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             List<Layer> selectedLayers = getModel().getSelectedLayers();
@@ -335,4 +339,5 @@
         }
 
+        @Override
         public void updateEnabledState() {
             setEnabled(! getModel().getSelectedLayers().isEmpty());
@@ -390,14 +395,16 @@
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             if (layer != null) {
                 layer.toggleVisible();
             } else {
-                for(Layer layer: model.getSelectedLayers()) {
-                    layer.toggleVisible();
-                }
-            }
-        }
-
+                for(Layer l : model.getSelectedLayers()) {
+                    l.toggleVisible();
+                }
+            }
+        }
+
+        @Override
         public void updateEnabledState() {
             if (layer == null) {
@@ -451,4 +458,5 @@
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             Layer toActivate;
@@ -470,4 +478,5 @@
         }
 
+        @Override
         public void updateEnabledState() {
             if (layer == null) {
@@ -483,10 +492,13 @@
         }
 
+        @Override
         public void activeLayerChange(Layer oldLayer, Layer newLayer) {
             updateEnabledState();
         }
+        @Override
         public void layerAdded(Layer newLayer) {
             updateEnabledState();
         }
+        @Override
         public void layerRemoved(Layer oldLayer) {
             updateEnabledState();
@@ -515,4 +527,5 @@
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             if (layer != null) {
@@ -530,4 +543,5 @@
         }
 
+        @Override
         public void updateEnabledState() {
             if (layer == null) {
@@ -567,4 +581,5 @@
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             if (layer != null) {
@@ -582,4 +597,5 @@
         }
 
+        @Override
         public void updateEnabledState() {
             if (layer == null) {
@@ -715,8 +731,10 @@
         }
 
+        @Override
         public void updateEnabledState() {
             setEnabled(model.canMoveUp());
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             model.moveUp();
@@ -734,8 +752,10 @@
         }
 
+        @Override
         public void updateEnabledState() {
             setEnabled(model.canMoveDown());
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             model.moveDown();
@@ -965,5 +985,5 @@
             if (!canMoveUp()) return;
             List<Integer> sel = getSelectedRows();
-            for (int row: sel) {
+            for (int row : sel) {
                 Layer l1 = getLayers().get(row);
                 Layer l2 = getLayers().get(row-1);
@@ -973,5 +993,5 @@
             fireTableDataChanged();
             selectionModel.clearSelection();
-            for(int row: sel) {
+            for (int row : sel) {
                 selectionModel.addSelectionInterval(row-1, row-1);
             }
@@ -999,5 +1019,5 @@
             List<Integer> sel = getSelectedRows();
             Collections.reverse(sel);
-            for (int row: sel) {
+            for (int row : sel) {
                 Layer l1 = getLayers().get(row);
                 Layer l2 = getLayers().get(row+1);
@@ -1007,5 +1027,5 @@
             fireTableDataChanged();
             selectionModel.clearSelection();
-            for(int row: sel) {
+            for (int row : sel) {
                 selectionModel.addSelectionInterval(row+1, row+1);
             }
@@ -1020,5 +1040,5 @@
         protected void ensureSelectedIsVisible() {
             int index = selectionModel.getMinSelectionIndex();
-            if (index <0 )return;
+            if (index < 0) return;
             if (index >= getLayers().size()) return;
             Layer layer = getLayers().get(index);
@@ -1038,5 +1058,5 @@
             if (source == null)
                 return targets;
-            for(Layer target: getLayers()) {
+            for (Layer target : getLayers()) {
                 if (source == target) {
                     continue;
@@ -1119,4 +1139,5 @@
         }
 
+        @Override
         public boolean isCellEditable(int row, int col) {
             if (col == 0 && getActiveLayer() == getLayers().get(row))
@@ -1125,4 +1146,5 @@
         }
 
+        @Override
         public void setValueAt(Object value, int row, int col) {
             Layer l = getLayers().get(row);
Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 3661)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 3662)
@@ -3,5 +3,4 @@
 // Parts of code from Geotagged plugin (by Rob Neild)
 // and the core JOSM source code (by Immanuel Scholz and others)
-
 package org.openstreetmap.josm.gui.layer.geoimage;
 
@@ -206,5 +205,5 @@
 
         protected String formatErrorMessages() {
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
             sb.append("<html>");
             if (errorMessages.size() == 1) {