Index: trunk/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java	(revision 9991)
+++ trunk/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java	(revision 9992)
@@ -39,16 +39,16 @@
      * {@link #en2}, {@link #en3}, {@link #en4}.
      */
-    private static final double C00 = 1.0,
-                                C02 = 0.25,
-                                C04 = 0.046875,
-                                C06 = 0.01953125,
-                                C08 = 0.01068115234375,
-                                C22 = 0.75,
-                                C44 = 0.46875,
-                                C46 = 0.01302083333333333333,
-                                C48 = 0.00712076822916666666,
-                                C66 = 0.36458333333333333333,
-                                C68 = 0.00569661458333333333,
-                                C88 = 0.3076171875;
+    private static final double C00 = 1.0;
+    private static final double C02 = 0.25;
+    private static final double C04 = 0.046875;
+    private static final double C06 = 0.01953125;
+    private static final double C08 = 0.01068115234375;
+    private static final double C22 = 0.75;
+    private static final double C44 = 0.46875;
+    private static final double C46 = 0.01302083333333333333;
+    private static final double C48 = 0.00712076822916666666;
+    private static final double C66 = 0.36458333333333333333;
+    private static final double C68 = 0.00569661458333333333;
+    private static final double C88 = 0.3076171875;
 
     /**
Index: trunk/src/org/openstreetmap/josm/gui/FileDrop.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/FileDrop.java	(revision 9991)
+++ trunk/src/org/openstreetmap/josm/gui/FileDrop.java	(revision 9992)
@@ -34,5 +34,4 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.OpenFileAction;
-import org.openstreetmap.josm.gui.FileDrop.TransferableObject;
 
 // CHECKSTYLE.OFF: HideUtilityClassConstructor
@@ -84,7 +83,4 @@
     private DropTargetListener dropListener;
 
-    /** Discover if the running JVM is modern enough to have drag and drop. */
-    private static Boolean supportsDnD;
-
     // Default border color
     private static Color defaultBorderColor = new Color(0f, 0f, 1f, 0.25f);
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java	(revision 9991)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java	(revision 9992)
@@ -98,5 +98,5 @@
             KeyEvent.VK_H, Shortcut.ALT_CTRL);
 
-    protected static final String[] COLUMN_TOOLTIPS = {
+    private static final String[] COLUMN_TOOLTIPS = {
             Main.platform.makeTooltip(tr("Enable filter"), ENABLE_FILTER_SHORTCUT),
             Main.platform.makeTooltip(tr("Hiding filter"), HIDING_FILTER_SHORTCUT),
@@ -180,6 +180,7 @@
             public void actionPerformed(ActionEvent e) {
                 int index = userTable.getSelectionModel().getMinSelectionIndex();
-                if (index < 0) return;
-                filterModel.removeFilter(index);
+                if (index >= 0) {
+                    filterModel.removeFilter(index);
+                }
             }
         });
@@ -194,9 +195,9 @@
             public void actionPerformed(ActionEvent e) {
                 int index = userTable.getSelectionModel().getMinSelectionIndex();
-                if (index < 0) return;
-                filterModel.moveUpFilter(index);
-                userTable.getSelectionModel().setSelectionInterval(index-1, index-1);
-            }
-
+                if (index >= 0) {
+                    filterModel.moveUpFilter(index);
+                    userTable.getSelectionModel().setSelectionInterval(index-1, index-1);
+                }
+            }
         });
         SideButton downButton = new SideButton(new AbstractAction() {
@@ -210,7 +211,8 @@
             public void actionPerformed(ActionEvent e) {
                 int index = userTable.getSelectionModel().getMinSelectionIndex();
-                if (index < 0) return;
-                filterModel.moveDownFilter(index);
-                userTable.getSelectionModel().setSelectionInterval(index+1, index+1);
+                if (index >= 0) {
+                    filterModel.moveDownFilter(index);
+                    userTable.getSelectionModel().setSelectionInterval(index+1, index+1);
+                }
             }
         });
@@ -221,7 +223,8 @@
             public void actionPerformed(ActionEvent e) {
                 int index = userTable.getSelectedRow();
-                if (index < 0) return;
-                Filter filter = filterModel.getFilter(index);
-                filterModel.setValueAt(!filter.enable, index, FilterTableModel.COL_ENABLED);
+                if (index >= 0) {
+                    Filter filter = filterModel.getFilter(index);
+                    filterModel.setValueAt(!filter.enable, index, FilterTableModel.COL_ENABLED);
+                }
             }
         });
@@ -232,7 +235,8 @@
             public void actionPerformed(ActionEvent e) {
                 int index = userTable.getSelectedRow();
-                if (index < 0) return;
-                Filter filter = filterModel.getFilter(index);
-                filterModel.setValueAt(!filter.hiding, index, FilterTableModel.COL_HIDING);
+                if (index >= 0) {
+                    Filter filter = filterModel.getFilter(index);
+                    filterModel.setValueAt(!filter.hiding, index, FilterTableModel.COL_HIDING);
+                }
             }
         });
Index: trunk/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java	(revision 9991)
+++ trunk/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java	(revision 9992)
@@ -30,5 +30,5 @@
      * default setting of autozoom per layer
      */
-    public static final BooleanProperty PROP_DEFAULT_AUTOZOOM = new BooleanProperty("imagery.wmts.default_autozoom", true);
+    public static final BooleanProperty PROP_DEFAULT_AUTOZOOM_WMTS = new BooleanProperty("imagery.wmts.default_autozoom", true);
     private static final String CACHE_REGION_NAME = "WMTS";
 
@@ -39,5 +39,5 @@
     public WMTSLayer(ImageryInfo info) {
         super(info);
-        autoZoom = PROP_DEFAULT_AUTOZOOM.get();
+        autoZoom = PROP_DEFAULT_AUTOZOOM_WMTS.get();
     }
 
@@ -63,9 +63,8 @@
             return 0;
         ScaleList scaleList = getNativeScales();
-        Scale snap = null;
         if (scaleList == null) {
             return getMaxZoomLvl();
         }
-        snap = scaleList.getSnapScale(Main.map.mapView.getScale(), false);
+        Scale snap = scaleList.getSnapScale(Main.map.mapView.getScale(), false);
         return Math.max(
                 getMinZoomLvl(),
Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java	(revision 9991)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java	(revision 9992)
@@ -36,5 +36,5 @@
     }
 
-    private class LambertCC9CBPanel extends CBPanel {
+    private static class LambertCC9CBPanel extends CBPanel {
         LambertCC9CBPanel(String[] entries, int initialIndex, String label, ActionListener listener) {
             super(entries, initialIndex, label, listener);
Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java	(revision 9991)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java	(revision 9992)
@@ -31,5 +31,5 @@
     }
 
-    private class LambertCBPanel extends CBPanel {
+    private static class LambertCBPanel extends CBPanel {
         LambertCBPanel(String[] entries, int initialIndex, String label, ActionListener listener) {
             super(entries, initialIndex, label, listener);
Index: trunk/src/org/openstreetmap/josm/tools/template_engine/ContextSwitchTemplate.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/template_engine/ContextSwitchTemplate.java	(revision 9991)
+++ trunk/src/org/openstreetmap/josm/tools/template_engine/ContextSwitchTemplate.java	(revision 9992)
@@ -46,5 +46,5 @@
     }
 
-    private class ParentSet extends ContextProvider {
+    private static class ParentSet extends ContextProvider {
         private final Match childCondition;
 
@@ -81,5 +81,5 @@
     }
 
-    private class ChildSet extends ContextProvider {
+    private static class ChildSet extends ContextProvider {
         private final Match parentCondition;
 
@@ -124,5 +124,5 @@
     }
 
-    private class OrSet extends ContextProvider {
+    private static class OrSet extends ContextProvider {
         private final ContextProvider lhs;
         private final ContextProvider rhs;
@@ -155,5 +155,5 @@
     }
 
-    private class AndSet extends ContextProvider {
+    private static class AndSet extends ContextProvider {
         private final ContextProvider lhs;
         private final ContextProvider rhs;