Index: trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java	(revision 12442)
+++ trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java	(revision 12445)
@@ -154,6 +154,4 @@
     /** whether this is a entry activated by default or not */
     private boolean defaultEntry;
-    /** The data part of HTTP cookies header in case the service requires cookies to work */
-    private String cookies;
     /** Whether this service requires a explicit EULA acceptance before it can be activated */
     private String eulaAcceptanceRequired;
@@ -842,13 +840,4 @@
 
     /**
-     * Return the data part of HTTP cookies header in case the service requires cookies to work
-     * @return the cookie data part
-     */
-    @Override
-    public String getCookies() {
-        return this.cookies;
-    }
-
-    /**
      * Gets the pixel per degree value
      * @return The ppd value.
Index: trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java	(revision 12442)
+++ trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java	(revision 12445)
@@ -160,5 +160,5 @@
      * Constants used in the transformation.
      */
-    private double b, e;
+    private double b, g;
 
     /**
@@ -249,6 +249,6 @@
             }
         }
-        e = f += d;
-        e = f * Math.pow(tsfn(latCenter, sinph0), b);
+        g = f += d;
+        g = f * Math.pow(tsfn(latCenter, sinph0), b);
 
         /*
@@ -288,7 +288,7 @@
             final double h = Math.pow(tsfn(lat1, Math.sin(lat1)), b);
             final double l = Math.pow(tsfn(lat2, Math.sin(lat2)), b);
-            final double fp = e / h;
+            final double fp = g / h;
             final double p = (l - h) / (l + h);
-            double j = e * e;
+            double j = g * g;
             j = (j - l * h) / (j + l * h);
             double diff = lon1 - lon2;
@@ -379,5 +379,5 @@
         double u, v;
         if (Math.abs(Math.abs(y) - Math.PI/2.0) > EPSILON) {
-            double q = e / Math.pow(tsfn(y, Math.sin(y)), b);
+            double q = g / Math.pow(tsfn(y, Math.sin(y)), b);
             double temp = 1.0 / q;
             double s = 0.5 * (q - temp);
@@ -420,5 +420,5 @@
         } else {
             return new double[] {
-                cphi2(Math.pow(e / Math.sqrt((1. + up) / (1. - up)), 1.0 / b)), //calculate t
+                cphi2(Math.pow(g / Math.sqrt((1. + up) / (1. - up)), 1.0 / b)), //calculate t
                 -Math.atan2(sp * cosgamma0 - vp * singamma0, Math.cos(bra * u)) / b};
         }
Index: trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java	(revision 12442)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java	(revision 12445)
@@ -47,5 +47,4 @@
  */
 public class MultiSplitPane extends JPanel {
-    private transient AccessibleContext accessibleContext;
     private boolean continuousLayout = true;
     private transient DividerPainter dividerPainter = new DefaultDividerPainter();
Index: trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java	(revision 12442)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java	(revision 12445)
@@ -43,5 +43,5 @@
     }
 
-    private final transient QuadStateDecorator model;
+    private final transient QuadStateDecorator cbModel;
     private State[] allowed;
 
@@ -60,5 +60,5 @@
             @Override public void mousePressed(MouseEvent e) {
                 grabFocus();
-                model.nextState();
+                cbModel.nextState();
             }
         });
@@ -69,5 +69,5 @@
             public void actionPerformed(ActionEvent e) {
                 grabFocus();
-                model.nextState();
+                cbModel.nextState();
             }
         });
@@ -75,6 +75,6 @@
         SwingUtilities.replaceUIActionMap(this, map);
         // set the model to the adapted model
-        model = new QuadStateDecorator(getModel());
-        setModel(model);
+        cbModel = new QuadStateDecorator(getModel());
+        setModel(cbModel);
         setState(initial);
     }
@@ -101,5 +101,5 @@
      */
     public final void setPropertyText(final String propertyText) {
-        model.setPropertyText(propertyText);
+        cbModel.setPropertyText(propertyText);
     }
 
@@ -109,5 +109,5 @@
      */
     public final void setState(State state) {
-        model.setState(state);
+        cbModel.setState(state);
     }
 
@@ -117,5 +117,5 @@
      */
     public State getState() {
-        return model.getState();
+        return cbModel.getState();
     }