Index: /trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java	(revision 9974)
+++ /trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java	(revision 9975)
@@ -46,5 +46,5 @@
     public abstract Collection<Command> execute(P oldprimitive, P primitive) throws UserCancelException;
 
-    private final String[] applicationOptions = new String[] {
+    private static final String[] APPLICATION_OPTIONS = new String[] {
             tr("Apply selected changes"),
             tr("Do not apply changes"),
@@ -133,6 +133,6 @@
                     JOptionPane.PLAIN_MESSAGE,
                     null,
-                    applicationOptions,
-                    applicationOptions[0]
+                    APPLICATION_OPTIONS,
+                    APPLICATION_OPTIONS[0]
             );
 
Index: /trunk/src/org/openstreetmap/josm/data/osm/Storage.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/Storage.java	(revision 9974)
+++ /trunk/src/org/openstreetmap/josm/data/osm/Storage.java	(revision 9975)
@@ -91,5 +91,5 @@
     private int size;
     private volatile int modCount;
-    private final double loadFactor = 0.6d;
+    private static final double LOAD_FACTOR = 0.6d;
     private static final int DEFAULT_CAPACITY = 16;
     private final boolean safeIterator;
@@ -143,5 +143,5 @@
     public Storage(Hash<? super T, ? super T> ha, int capacity, boolean safeIterator) {
         this.hash = ha;
-        int cap = 1 << (int) (Math.ceil(Math.log(capacity/loadFactor) / Math.log(2)));
+        int cap = 1 << (int) (Math.ceil(Math.log(capacity/LOAD_FACTOR) / Math.log(2)));
         @SuppressWarnings("unchecked") T[] newData = (T[]) new Object[cap];
         data = newData;
@@ -328,5 +328,5 @@
 
     private void ensureSpace() {
-        if (size > data.length*loadFactor) { // rehash
+        if (size > data.length*LOAD_FACTOR) { // rehash
             @SuppressWarnings("unchecked") T[] big = (T[]) new Object[data.length * 2];
             int nMask = big.length - 1;
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java	(revision 9974)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java	(revision 9975)
@@ -98,5 +98,5 @@
             KeyEvent.VK_H, Shortcut.ALT_CTRL);
 
-    protected final String[] columnToolTips = {
+    protected static final String[] COLUMN_TOOLTIPS = {
             Main.platform.makeTooltip(tr("Enable filter"), ENABLE_FILTER_SHORTCUT),
             Main.platform.makeTooltip(tr("Hiding filter"), HIDING_FILTER_SHORTCUT),
@@ -116,5 +116,5 @@
                         int index = columnModel.getColumnIndexAtX(p.x);
                         int realIndex = columnModel.getColumn(index).getModelIndex();
-                        return columnToolTips[realIndex];
+                        return COLUMN_TOOLTIPS[realIndex];
                     }
                 };
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java	(revision 9974)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java	(revision 9975)
@@ -888,5 +888,5 @@
         @Override
         public boolean supportLayers(List<Layer> layers) {
-            if (layers.size() < 1) {
+            if (layers.isEmpty()) {
                 return false;
             } else {
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java	(revision 9974)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java	(revision 9975)
@@ -21,5 +21,5 @@
 
     @SuppressWarnings("unchecked")
-    private final DividedScale<StyleElementList>[] states = (DividedScale<StyleElementList>[]) new DividedScale[2];
+    private final DividedScale<StyleElementList>[] states = new DividedScale[2];
 
     private StyleCache(StyleCache sc) {