Index: trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java	(revision 10747)
+++ trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java	(revision 10748)
@@ -500,5 +500,5 @@
      * @return correct angle
      */
-    private static double standard_angle_0_to_2PI(double a) {
+    private static double standardAngle0to2PI(double a) {
         while (a >= 2 * Math.PI) {
             a -= 2 * Math.PI;
@@ -515,5 +515,5 @@
      * @return correct angle
      */
-    private static double standard_angle_mPI_to_PI(double a) {
+    private static double standardAngleMPItoPI(double a) {
         while (a > Math.PI) {
             a -= 2 * Math.PI;
@@ -572,5 +572,5 @@
      */
     private static int angleToDirectionChange(double a, double deltaMax) throws RejectedAngleException {
-        a = standard_angle_mPI_to_PI(a);
+        a = standardAngleMPItoPI(a);
         double d0 = Math.abs(a);
         double d90 = Math.abs(a - Math.PI / 2);
@@ -584,5 +584,5 @@
             dirChange = -1;
         } else {
-            a = standard_angle_0_to_2PI(a);
+            a = standardAngle0to2PI(a);
             double d180 = Math.abs(a - Math.PI);
             if (d180 < deltaMax) {
Index: trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 10747)
+++ trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 10748)
@@ -712,5 +712,5 @@
         synchronized (selectionLock) {
             for (PrimitiveId o : osm) {
-                changed = changed | this.__toggleSelected(o);
+                changed = changed | this.dotoggleSelected(o);
             }
             if (changed) {
@@ -731,5 +731,5 @@
     }
 
-    private boolean __toggleSelected(PrimitiveId primitiveId) {
+    private boolean dotoggleSelected(PrimitiveId primitiveId) {
         OsmPrimitive primitive = getPrimitiveByIdChecked(primitiveId);
         if (primitive == null)
Index: trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java	(revision 10747)
+++ trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java	(revision 10748)
@@ -134,5 +134,5 @@
         }
 
-        boolean remove_content(T o) {
+        boolean removeContent(T o) {
             // If two threads try to remove item at the same time from different buckets of this QBLevel,
             // it might happen that one thread removes bucket but don't remove parent because it still sees
@@ -147,5 +147,5 @@
             }
             if (this.canRemove()) {
-                this.remove_from_parent();
+                this.removeFromParent();
             }
             return ret;
@@ -158,5 +158,5 @@
          * is a dead end.
          */
-        void __split() {
+        void doSplit() {
             List<T> tmpcontent = content;
             content = null;
@@ -165,5 +165,5 @@
                 int idx = o.getBBox().getIndex(level);
                 if (idx == -1) {
-                    __add_content(o);
+                    doAddContent(o);
                 } else {
                     getChild(idx).doAdd(o);
@@ -173,5 +173,5 @@
         }
 
-        boolean __add_content(T o) {
+        boolean doAddContent(T o) {
             // The split_lock will keep two concurrent calls from overwriting content
             if (content == null) {
@@ -190,5 +190,5 @@
         }
 
-        private void search_contents(BBox searchBbox, List<T> result) {
+        private void searchContents(BBox searchBbox, List<T> result) {
             /*
              * It is possible that this was created in a split
@@ -219,5 +219,5 @@
         }
 
-        QBLevel<T> next_sibling() {
+        QBLevel<T> findNextSibling() {
             return (parent == null) ? null : parent.firstSiblingOf(this);
         }
@@ -229,5 +229,5 @@
         QBLevel<T> nextSibling() {
             QBLevel<T> next = this;
-            QBLevel<T> sibling = next.next_sibling();
+            QBLevel<T> sibling = next.findNextSibling();
             // Walk back up the tree to find the next sibling node.
             // It may be either a leaf or branch.
@@ -237,5 +237,5 @@
                     break;
                 }
-                sibling = next.next_sibling();
+                sibling = next.findNextSibling();
             }
             return sibling;
@@ -289,7 +289,7 @@
                 }
             }
-            __add_content(o);
+            doAddContent(o);
             if (isLeaf() && content.size() > MAX_OBJECTS_PER_LEVEL && level < QuadTiling.NR_LEVELS) {
-                __split();
+                doSplit();
             }
         }
@@ -307,5 +307,5 @@
 
             if (this.hasContent()) {
-                search_contents(searchBbox, result);
+                searchContents(searchBbox, result);
             }
 
@@ -330,5 +330,5 @@
         }
 
-        int index_of(QBLevel<T> findThis) {
+        int indexOf(QBLevel<T> findThis) {
             QBLevel<T>[] children = getChildren();
             for (int i = 0; i < QuadTiling.TILES_PER_LEVEL; i++) {
@@ -359,5 +359,5 @@
         }
 
-        void remove_from_parent() {
+        void removeFromParent() {
             if (parent == null)
                 return;
@@ -378,5 +378,5 @@
 
             if (parent.canRemove()) {
-                parent.remove_from_parent();
+                parent.removeFromParent();
             }
         }
@@ -461,5 +461,5 @@
         searchCache = null; // Search cache might point to one of removed buckets
         QBLevel<T> bucket = root.findBucket(t.getBBox());
-        if (bucket.remove_content(t)) {
+        if (bucket.removeContent(t)) {
             size--;
             return true;
@@ -564,5 +564,5 @@
             contentIndex--;
             T object = peek();
-            currentNode.remove_content(object);
+            currentNode.removeContent(object);
         }
     }
@@ -607,5 +607,5 @@
         // of the nodes which is a parent of the search cache
         while (tmp != null) {
-            tmp.search_contents(searchBbox, ret);
+            tmp.searchContents(searchBbox, ret);
             tmp = tmp.parent;
         }
Index: trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java	(revision 10747)
+++ trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java	(revision 10748)
@@ -416,17 +416,17 @@
             if (parameters.get(Param.es.key) != null) {
                 double es = parseDouble(parameters, Param.es.key);
-                return Ellipsoid.create_a_es(a, es);
+                return Ellipsoid.createAes(a, es);
             }
             if (parameters.get(Param.rf.key) != null) {
                 double rf = parseDouble(parameters, Param.rf.key);
-                return Ellipsoid.create_a_rf(a, rf);
+                return Ellipsoid.createArf(a, rf);
             }
             if (parameters.get(Param.f.key) != null) {
                 double f = parseDouble(parameters, Param.f.key);
-                return Ellipsoid.create_a_f(a, f);
+                return Ellipsoid.createAf(a, f);
             }
             if (parameters.get(Param.b.key) != null) {
                 double b = parseDouble(parameters, Param.b.key);
-                return Ellipsoid.create_a_b(a, b);
+                return Ellipsoid.createAb(a, b);
             }
         }
Index: trunk/src/org/openstreetmap/josm/data/projection/Ellipsoid.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/Ellipsoid.java	(revision 10747)
+++ trunk/src/org/openstreetmap/josm/data/projection/Ellipsoid.java	(revision 10748)
@@ -17,10 +17,10 @@
      * Airy 1830
      */
-    public static final Ellipsoid Airy = Ellipsoid.create_a_b(6377563.396, 6356256.910);
+    public static final Ellipsoid Airy = Ellipsoid.createAb(6377563.396, 6356256.910);
 
     /**
      * Modified Airy 1849
      */
-    public static final Ellipsoid AiryMod = Ellipsoid.create_a_b(6377340.189, 6356034.446);
+    public static final Ellipsoid AiryMod = Ellipsoid.createAb(6377340.189, 6356034.446);
 
     /**
@@ -28,45 +28,45 @@
      * same as GRS67 Modified
      */
-    public static final Ellipsoid AustSA = Ellipsoid.create_a_rf(6378160.0, 298.25);
+    public static final Ellipsoid AustSA = Ellipsoid.createArf(6378160.0, 298.25);
 
     /**
      * Bessel 1841 ellipsoid
      */
-    public static final Ellipsoid Bessel1841 = Ellipsoid.create_a_rf(6377397.155, 299.1528128);
+    public static final Ellipsoid Bessel1841 = Ellipsoid.createArf(6377397.155, 299.1528128);
 
     /**
      * Bessel 1841 (Namibia)
      */
-    public static final Ellipsoid BesselNamibia = Ellipsoid.create_a_rf(6377483.865, 299.1528128);
+    public static final Ellipsoid BesselNamibia = Ellipsoid.createArf(6377483.865, 299.1528128);
 
     /**
      * Clarke 1866 ellipsoid
      */
-    public static final Ellipsoid Clarke1866 = Ellipsoid.create_a_b(6378206.4, 6356583.8);
+    public static final Ellipsoid Clarke1866 = Ellipsoid.createAb(6378206.4, 6356583.8);
 
     /**
      * Clarke 1880 (modified)
      */
-    public static final Ellipsoid Clarke1880 = Ellipsoid.create_a_rf(6378249.145, 293.4663);
+    public static final Ellipsoid Clarke1880 = Ellipsoid.createArf(6378249.145, 293.4663);
 
     /**
      * Clarke 1880 IGN (French national geographic institute)
      */
-    public static final Ellipsoid ClarkeIGN = Ellipsoid.create_a_b(6378249.2, 6356515.0);
+    public static final Ellipsoid ClarkeIGN = Ellipsoid.createAb(6378249.2, 6356515.0);
 
     /**
      * Everest (Sabah &amp; Sarawak)
      */
-    public static final Ellipsoid EverestSabahSarawak = Ellipsoid.create_a_rf(6377298.556, 300.8017);
+    public static final Ellipsoid EverestSabahSarawak = Ellipsoid.createArf(6377298.556, 300.8017);
 
     /**
      * GRS67 ellipsoid
      */
-    public static final Ellipsoid GRS67 = Ellipsoid.create_a_rf(6378160.0, 298.247167427);
+    public static final Ellipsoid GRS67 = Ellipsoid.createArf(6378160.0, 298.247167427);
 
     /**
      * GRS80 ellipsoid
      */
-    public static final Ellipsoid GRS80 = Ellipsoid.create_a_rf(6378137.0, 298.257222101);
+    public static final Ellipsoid GRS80 = Ellipsoid.createArf(6378137.0, 298.257222101);
 
     /**
@@ -75,30 +75,30 @@
      * Proj.4 code: intl
      */
-    public static final Ellipsoid Hayford = Ellipsoid.create_a_rf(6378388.0, 297.0);
+    public static final Ellipsoid Hayford = Ellipsoid.createArf(6378388.0, 297.0);
 
     /**
      * Helmert 1906
      */
-    public static final Ellipsoid Helmert = Ellipsoid.create_a_rf(6378200.0, 298.3);
+    public static final Ellipsoid Helmert = Ellipsoid.createArf(6378200.0, 298.3);
 
     /**
      * Krassowsky 1940 ellipsoid
      */
-    public static final Ellipsoid Krassowsky = Ellipsoid.create_a_rf(6378245.0, 298.3);
+    public static final Ellipsoid Krassowsky = Ellipsoid.createArf(6378245.0, 298.3);
 
     /**
      * WGS66 ellipsoid
      */
-    public static final Ellipsoid WGS66 = Ellipsoid.create_a_rf(6378145.0, 298.25);
+    public static final Ellipsoid WGS66 = Ellipsoid.createArf(6378145.0, 298.25);
 
     /**
      * WGS72 ellipsoid
      */
-    public static final Ellipsoid WGS72 = Ellipsoid.create_a_rf(6378135.0, 298.26);
+    public static final Ellipsoid WGS72 = Ellipsoid.createArf(6378135.0, 298.26);
 
     /**
      * WGS84 ellipsoid
      */
-    public static final Ellipsoid WGS84 = Ellipsoid.create_a_rf(6378137.0, 298.257223563);
+    public static final Ellipsoid WGS84 = Ellipsoid.createArf(6378137.0, 298.257223563);
 
     /**
@@ -162,5 +162,5 @@
      * @return the new ellipsoid
      */
-    public static Ellipsoid create_a_b(double a, double b) {
+    public static Ellipsoid createAb(double a, double b) {
         double e2 = (a*a - b*b) / (a*a);
         double e = Math.sqrt(e2);
@@ -176,5 +176,5 @@
      * @return the new ellipsoid
      */
-    public static Ellipsoid create_a_es(double a, double es) {
+    public static Ellipsoid createAes(double a, double es) {
         double b = a * Math.sqrt(1.0 - es);
         double e = Math.sqrt(es);
@@ -190,5 +190,5 @@
      * @return the new ellipsoid
      */
-    public static Ellipsoid create_a_f(double a, double f) {
+    public static Ellipsoid createAf(double a, double f) {
         double b = a * (1.0 - f);
         double e2 = f * (2 - f);
@@ -205,6 +205,6 @@
      * @return the new ellipsoid
      */
-    public static Ellipsoid create_a_rf(double a, double rf) {
-        return create_a_f(a, 1.0 / rf);
+    public static Ellipsoid createArf(double a, double rf) {
+        return createAf(a, 1.0 / rf);
     }
 
Index: trunk/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java	(revision 10747)
+++ trunk/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java	(revision 10748)
@@ -137,5 +137,5 @@
      * @throws RuntimeException if the itteration does not converge.
      */
-    protected final double inv_mlfn(double arg) {
+    protected final double invMlfn(double arg) {
         double s, t, phi, k = 1.0/(1.0 - e2);
         int i;
Index: trunk/src/org/openstreetmap/josm/data/projection/proj/CassiniSoldner.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/proj/CassiniSoldner.java	(revision 10747)
+++ trunk/src/org/openstreetmap/josm/data/projection/proj/CassiniSoldner.java	(revision 10748)
@@ -79,5 +79,5 @@
     @Override
     public double[] invproject(double x, double y) {
-        double ph1 = inv_mlfn(ml0 + y);
+        double ph1 = invMlfn(ml0 + y);
         double tn = Math.tan(ph1);
         double t = tn * tn;
Index: trunk/src/org/openstreetmap/josm/data/projection/proj/Sinusoidal.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/proj/Sinusoidal.java	(revision 10747)
+++ trunk/src/org/openstreetmap/josm/data/projection/proj/Sinusoidal.java	(revision 10748)
@@ -43,5 +43,5 @@
             return new double[]{north, east / cos(north)};
         } else {
-            final double phi = inv_mlfn(north);
+            final double phi = invMlfn(north);
             double s = abs(phi);
             final double lambda;
Index: trunk/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java	(revision 10747)
+++ trunk/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java	(revision 10748)
@@ -156,5 +156,5 @@
     @Override
     public double[] invproject(double x, double y) {
-        double phi = inv_mlfn(ml0 + y);
+        double phi = invMlfn(ml0 + y);
 
         if (Math.abs(phi) >= Math.PI/2) {
Index: trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java	(revision 10747)
+++ trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java	(revision 10748)
@@ -4,5 +4,5 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trc;
-import static org.openstreetmap.josm.tools.I18n.trc_lazy;
+import static org.openstreetmap.josm.tools.I18n.trcLazy;
 import static org.openstreetmap.josm.tools.I18n.trn;
 
@@ -436,7 +436,7 @@
             return null;
         } else if (nameTag.startsWith("?")) {
-            return trc_lazy(nameTag, I18n.escape(relation.get(nameTag.substring(1))));
-        } else {
-            return trc_lazy(nameTag, I18n.escape(relation.get(nameTag)));
+            return trcLazy(nameTag, I18n.escape(relation.get(nameTag.substring(1))));
+        } else {
+            return trcLazy(nameTag, I18n.escape(relation.get(nameTag)));
         }
     }
Index: trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java	(revision 10747)
+++ trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java	(revision 10748)
@@ -73,9 +73,9 @@
 
     private void diff() {
-        Diff.Change script = new Diff(reference, current).diff_2(false);
+        Diff.Change script = new Diff(reference, current).diff2(false);
         // attempt diff with reference reversed and test whether less deletions+inserts are required
         Object[] referenceReversed = Utils.copyArray(reference);
         Collections.reverse(Arrays.asList(referenceReversed));
-        Diff.Change scriptReversed = new Diff(referenceReversed, current).diff_2(false);
+        Diff.Change scriptReversed = new Diff(referenceReversed, current).diff2(false);
         if (scriptReversed == null /* reference and current are identical */
                 || (script != null && scriptReversed.getTotalNumberOfChanges() < script.getTotalNumberOfChanges())) {
Index: trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java	(revision 10747)
+++ trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java	(revision 10748)
@@ -1335,12 +1335,12 @@
          */
         private List<Tile> allExistingTiles() {
-            return this.__allTiles(false);
+            return this.findAllTiles(false);
         }
 
         private List<Tile> allTilesCreate() {
-            return this.__allTiles(true);
-        }
-
-        private List<Tile> __allTiles(boolean create) {
+            return this.findAllTiles(true);
+        }
+
+        private List<Tile> findAllTiles(boolean create) {
             // Tileset is either empty or too large
             if (zoom == 0 || this.insane())
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	(revision 10747)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	(revision 10748)
@@ -164,5 +164,5 @@
      *  can be null if the defaults are turned off by user
      */
-    public static ImageIcon getNoIcon_Icon(StyleSource source) {
+    public static ImageIcon getNoIconIcon(StyleSource source) {
         return new ImageProvider("presets/misc/no_icon")
                 .setDirs(getIconSourceDirs(source))
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java	(revision 10747)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java	(revision 10748)
@@ -327,5 +327,5 @@
          */
         public static float red(Color c) { // NO_UCD (unused code)
-            return Utils.color_int2float(c.getRed());
+            return Utils.colorInt2float(c.getRed());
         }
 
@@ -337,5 +337,5 @@
          */
         public static float green(Color c) { // NO_UCD (unused code)
-            return Utils.color_int2float(c.getGreen());
+            return Utils.colorInt2float(c.getGreen());
         }
 
@@ -347,5 +347,5 @@
          */
         public static float blue(Color c) { // NO_UCD (unused code)
-            return Utils.color_int2float(c.getBlue());
+            return Utils.colorInt2float(c.getBlue());
         }
 
@@ -357,5 +357,5 @@
          */
         public static float alpha(Color c) { // NO_UCD (unused code)
-            return Utils.color_int2float(c.getAlpha());
+            return Utils.colorInt2float(c.getAlpha());
         }
 
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java	(revision 10747)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java	(revision 10748)
@@ -55,5 +55,5 @@
 
             fillImage.alpha = Math.min(255, Math.max(0, Integer.valueOf(Main.pref.getInteger("mappaint.fill-image-alpha", 255))));
-            Integer pAlpha = Utils.color_float2int(c.get(FILL_OPACITY, null, float.class));
+            Integer pAlpha = Utils.colorFloat2int(c.get(FILL_OPACITY, null, float.class));
             if (pAlpha != null) {
                 fillImage.alpha = pAlpha;
@@ -71,5 +71,5 @@
                     alpha = Math.min(255, Math.max(0, Integer.valueOf(Main.pref.getInteger("mappaint.fillalpha", 50))));
                 }
-                Integer pAlpha = Utils.color_float2int(c.get(FILL_OPACITY, null, float.class));
+                Integer pAlpha = Utils.colorFloat2int(c.get(FILL_OPACITY, null, float.class));
                 if (pAlpha != null) {
                     alpha = pAlpha;
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java	(revision 10747)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java	(revision 10748)
@@ -256,5 +256,5 @@
         }
 
-        Integer pAlpha = Utils.color_float2int(c.get(type.prefix + OPACITY, null, Float.class));
+        Integer pAlpha = Utils.colorFloat2int(c.get(type.prefix + OPACITY, null, Float.class));
         if (pAlpha != null) {
             alpha = pAlpha;
@@ -281,5 +281,5 @@
         Color dashesBackground = c.get(type.prefix + DASHES_BACKGROUND_COLOR, null, Color.class);
         if (dashesBackground != null) {
-            pAlpha = Utils.color_float2int(c.get(type.prefix + DASHES_BACKGROUND_OPACITY, null, Float.class));
+            pAlpha = Utils.colorFloat2int(c.get(type.prefix + DASHES_BACKGROUND_OPACITY, null, Float.class));
             if (pAlpha != null) {
                 alpha = pAlpha;
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/MapImage.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/MapImage.java	(revision 10747)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/MapImage.java	(revision 10748)
@@ -102,5 +102,5 @@
                         if (result == null) {
                             source.logWarning(tr("Failed to locate image ''{0}''", name));
-                            ImageIcon noIcon = MapPaintStyles.getNoIcon_Icon(source);
+                            ImageIcon noIcon = MapPaintStyles.getNoIconIcon(source);
                             img = noIcon == null ? null : (BufferedImage) noIcon.getImage();
                         } else {
@@ -134,5 +134,5 @@
 
     public float getAlphaFloat() {
-        return Utils.color_int2float(alpha);
+        return Utils.colorInt2float(alpha);
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java	(revision 10747)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java	(revision 10748)
@@ -185,5 +185,5 @@
 
         mapImage.alpha = Math.min(255, Math.max(0, Integer.valueOf(Main.pref.getInteger("mappaint.icon-image-alpha", 255))));
-        Integer pAlpha = Utils.color_float2int(c.get(keys[ICON_OPACITY_IDX], null, float.class));
+        Integer pAlpha = Utils.colorFloat2int(c.get(keys[ICON_OPACITY_IDX], null, float.class));
         if (pAlpha != null) {
             mapImage.alpha = pAlpha;
@@ -247,5 +247,5 @@
         Stroke stroke = null;
         if (strokeColor != null && strokeWidth != null) {
-            Integer strokeAlpha = Utils.color_float2int(c.get("symbol-stroke-opacity", null, Float.class));
+            Integer strokeAlpha = Utils.colorFloat2int(c.get("symbol-stroke-opacity", null, Float.class));
             if (strokeAlpha != null) {
                 strokeColor = new Color(strokeColor.getRed(), strokeColor.getGreen(),
@@ -261,5 +261,5 @@
 
         if (fillColor != null) {
-            Integer fillAlpha = Utils.color_float2int(c.get("symbol-fill-opacity", null, Float.class));
+            Integer fillAlpha = Utils.colorFloat2int(c.get("symbol-fill-opacity", null, Float.class));
             if (fillAlpha != null) {
                 fillColor = new Color(fillColor.getRed(), fillColor.getGreen(),
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextLabel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextLabel.java	(revision 10747)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextLabel.java	(revision 10748)
@@ -147,5 +147,5 @@
         float alpha = c.get(TEXT_OPACITY, 1f, Float.class);
         color = new Color(color.getRed(), color.getGreen(),
-                color.getBlue(), Utils.color_float2int(alpha));
+                color.getBlue(), Utils.colorFloat2int(alpha));
 
         Float haloRadius = c.get(TEXT_HALO_RADIUS, null, Float.class);
@@ -158,5 +158,5 @@
             float haloAlpha = c.get(TEXT_HALO_OPACITY, 1f, Float.class);
             haloColor = new Color(haloColor.getRed(), haloColor.getGreen(),
-                    haloColor.getBlue(), Utils.color_float2int(haloAlpha));
+                    haloColor.getBlue(), Utils.colorFloat2int(haloAlpha));
         }
 
Index: trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java	(revision 10747)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java	(revision 10748)
@@ -843,7 +843,7 @@
          *
          * @return the value of the parent property.
-         * @see #parent_set
-         */
-        public Split parent_get() {
+         * @see #setParent
+         */
+        public Split getParent() {
             return parent;
         }
@@ -857,7 +857,7 @@
          *
          * @param parent a Split or null
-         * @see #parent_get
-         */
-        public void parent_set(Split parent) {
+         * @see #getParent
+         */
+        public void setParent(Split parent) {
             this.parent = parent;
         }
@@ -920,5 +920,5 @@
 
         private Node siblingAtOffset(int offset) {
-            Split parent = parent_get();
+            Split parent = getParent();
             if (parent == null)
                 return null;
@@ -1017,9 +1017,9 @@
                 throw new IllegalArgumentException("children must be a non-null List");
             for (Node child : this.children) {
-                child.parent_set(null);
+                child.setParent(null);
             }
             this.children = new ArrayList<>(children);
             for (Node child : this.children) {
-                child.parent_set(this);
+                child.setParent(this);
             }
         }
@@ -1126,5 +1126,5 @@
          */
         public final boolean isVertical() {
-            Split parent = parent_get();
+            Split parent = getParent();
             return parent != null && parent.isRowLayout();
         }
Index: trunk/src/org/openstreetmap/josm/tools/Diff.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Diff.java	(revision 10747)
+++ trunk/src/org/openstreetmap/josm/tools/Diff.java	(revision 10748)
@@ -291,7 +291,7 @@
     /** Discard lines from one file that have no matches in the other file.
      */
-    private void discard_confusing_lines() {
-        filevec[0].discard_confusing_lines(filevec[1]);
-        filevec[1].discard_confusing_lines(filevec[0]);
+    private void discardConfusingLines() {
+        filevec[0].discardConfusingLines(filevec[1]);
+        filevec[1].discardConfusingLines(filevec[0]);
     }
 
@@ -299,7 +299,7 @@
      * Adjust inserts/deletes of blank lines to join changes as much as possible.
      */
-    private void shift_boundaries() {
-        filevec[0].shift_boundaries(filevec[1]);
-        filevec[1].shift_boundaries(filevec[0]);
+    private void shiftBoundaries() {
+        filevec[0].shiftBoundaries(filevec[1]);
+        filevec[1].shiftBoundaries(filevec[0]);
     }
 
@@ -403,5 +403,5 @@
      * @return the differences of two files
      */
-    public final Change diff_2(final boolean reverse) {
+    public final Change diff2(final boolean reverse) {
         return diff(reverse ? reverseScript : forwardScript);
     }
@@ -420,5 +420,5 @@
         // Some lines are obviously insertions or deletions because they don't match anything.
         // Detect them now, and avoid even thinking about them in the main comparison algorithm.
-        discard_confusing_lines();
+        discardConfusingLines();
 
         // Now do the main comparison algorithm, considering just the undiscarded lines.
@@ -438,5 +438,5 @@
 
         // Modify the results slightly to make them prettier in cases where that can validly be done.
-        shift_boundaries();
+        shiftBoundaries();
 
         // Get the results of comparison in the form of a chain of `struct change's -- an edit script.
@@ -547,5 +547,5 @@
          * @param f the other file
          */
-        void discard_confusing_lines(FileData f) {
+        void discardConfusingLines(FileData f) {
             clear();
             // Set up table of which lines are going to be discarded.
@@ -749,17 +749,14 @@
         }
 
-        /** Adjust inserts/deletes of blank lines to join changes
-       as much as possible.
-
-       We do something when a run of changed lines include a blank
-       line at one end and have an excluded blank line at the other.
-       We are free to choose which blank line is included.
-       `compareseq' always chooses the one at the beginning,
-       but usually it is cleaner to consider the following blank line
-       to be the "change".  The only exception is if the preceding blank line
-       would join this change to other changes.
-      @param f the file being compared against
+        /**
+         * Adjust inserts/deletes of blank lines to join changes as much as possible.
+         *
+         * We do something when a run of changed lines include a blank line at one end and have an excluded blank line at the other.
+         * We are free to choose which blank line is included.
+         * `compareseq' always chooses the one at the beginning, but usually it is cleaner to consider the following blank line
+         * to be the "change". The only exception is if the preceding blank line would join this change to other changes.
+         * @param f the file being compared against
          */
-        void shift_boundaries(FileData f) {
+        void shiftBoundaries(FileData f) {
             final boolean[] changed = changedFlag;
             final boolean[] otherChanged = f.changedFlag;
Index: trunk/src/org/openstreetmap/josm/tools/I18n.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/I18n.java	(revision 10747)
+++ trunk/src/org/openstreetmap/josm/tools/I18n.java	(revision 10748)
@@ -232,10 +232,10 @@
     }
 
-    public static String trc_lazy(String context, String text) {
+    public static String trcLazy(String context, String text) {
         if (context == null)
             return tr(text);
         if (text == null)
             return null;
-        return MessageFormat.format(gettext_lazy(text, context), (Object) null);
+        return MessageFormat.format(gettextLazy(text, context), (Object) null);
     }
 
@@ -337,5 +337,5 @@
 
     /* try without context, when context try fails */
-    private static String gettext_lazy(String text, String ctx) {
+    private static String gettextLazy(String text, String ctx) {
         return gettext(text, ctx, true);
     }
Index: trunk/src/org/openstreetmap/josm/tools/Utils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 10747)
+++ trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 10748)
@@ -309,5 +309,5 @@
      *         range 0...1. If val is outside that range, return 255
      */
-    public static Integer color_float2int(Float val) {
+    public static Integer colorFloat2int(Float val) {
         if (val == null)
             return null;
@@ -323,5 +323,5 @@
      * @return corresponding float value in range 0 &lt;= x &lt;= 1
      */
-    public static Float color_int2float(Integer val) {
+    public static Float colorInt2float(Integer val) {
         if (val == null)
             return null;