Changeset 12538 in josm

Timestamp:

2017-07-30T00:47:03+02:00 (7 years ago)

Author:

Don-vip

Message:

PMD - ShortMethodName

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/coor/LatLon.java (modified) (4 diffs)
• tools/ColorScale.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

@@ -234 +234 @@
      * @param pCoordinate The coordinate to convert
      * @return The coordinate in degrees/minutes format
-     */
-    public static String dm(double pCoordinate) {
+     * @since 12537
+     */
+    public static String degreesMinutes(double pCoordinate) {
 
         double tAbsCoord = Math.abs(pCoordinate);
@@ -250 +251 @@
 
         return sDegrees + '\u00B0' + sMinutes + '\'';
+    }
+
+    /**
+     * Replies the coordinate in degrees/minutes format
+     * @param pCoordinate The coordinate to convert
+     * @return The coordinate in degrees/minutes format
+     * @deprecated use {@link #degreesMinutes(double)} instead
+     */
+    @Deprecated
+    public static String dm(double pCoordinate) {
+        return degreesMinutes(pCoordinate);
     }
 
@@ -291 +303 @@
         case DECIMAL_DEGREES: return cDdFormatter.format(y);
         case DEGREES_MINUTES_SECONDS: return dms(y) + ((y < 0) ? SOUTH : NORTH);
-        case NAUTICAL: return dm(y) + ((y < 0) ? SOUTH : NORTH);
+        case NAUTICAL: return degreesMinutes(y) + ((y < 0) ? SOUTH : NORTH);
         case EAST_NORTH: return cDdFormatter.format(this.getEastNorth().north());
         default: return "ERR";
@@ -311 +323 @@
         case DECIMAL_DEGREES: return cDdFormatter.format(x);
         case DEGREES_MINUTES_SECONDS: return dms(x) + ((x < 0) ? WEST : EAST);
-        case NAUTICAL: return dm(x) + ((x < 0) ? WEST : EAST);
+        case NAUTICAL: return degreesMinutes(x) + ((x < 0) ? WEST : EAST);
         case EAST_NORTH: return cDdFormatter.format(this.getEastNorth().east());
         default: return "ERR";

trunk/src/org/openstreetmap/josm/tools/ColorScale.java

@@ -62 +62 @@
             quadrant = Utils.mod(quadrant+1, 4);
 
-            float vh = h[quadrant] * w(angle) + h[quadrant+1] * (1 - w(angle));
-            float vs = s[quadrant] * w(angle) + s[Utils.mod(quadrant+1, 4)] * (1 - w(angle));
-            float vb = b[quadrant] * w(angle) + b[Utils.mod(quadrant+1, 4)] * (1 - w(angle));
+            float vh = h[quadrant] * weighted(angle) + h[quadrant+1] * (1 - weighted(angle));
+            float vs = s[quadrant] * weighted(angle) + s[Utils.mod(quadrant+1, 4)] * (1 - weighted(angle));
+            float vb = b[quadrant] * weighted(angle) + b[Utils.mod(quadrant+1, 4)] * (1 - weighted(angle));
 
             sc.colors[i] = Color.getHSBColor(vh/360f, vs/100f, vb/100f);
@@ -79 +79 @@
      * @return the weighted value
      */
-    private static float w(float x) {
+    private static float weighted(float x) {
         if (x < 0.5)
             return 1 - 2*x*x;