Changeset 9108 in josm

Timestamp:

2015-12-13T12:13:26+01:00 (8 years ago)

Author:

Don-vip

Message:

checkstyle

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/projection/Projections.java (modified) (2 diffs)
• data/projection/proj/DoubleStereographic.java (modified) (1 diff)
• io/imagery/WMSImagery.java (modified) (1 diff)
• tools/Geometry.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/projection/Projections.java

@@ -107 +107 @@
                 Ellipsoid.Clarke1880, -263.0, 6.0, 431.0));
         datums.put("GGRS87", new ThreeParameterDatum(
-                "Greek Geodetic Reference System 1987", "GGRS87", 
+                "Greek Geodetic Reference System 1987", "GGRS87",
                 Ellipsoid.GRS80, -199.87, 74.79, 246.62));
-        datums.put("hermannskogel",new ThreeParameterDatum(
+        datums.put("hermannskogel", new ThreeParameterDatum(
                 "Hermannskogel", "hermannskogel",
                 Ellipsoid.Bessel1841, 653.0, -212.0, 449.0));
@@ -119 +119 @@
                 Ellipsoid.Hayford, 59.47, -5.04, 187.44, 0.47, -0.1, 1.024, -4.5993));
         datums.put("OSGB36", new SevenParameterDatum(
-                "Airy 1830", "OSGB36", 
+                "Airy 1830", "OSGB36",
                 Ellipsoid.Airy, 446.448, -125.157, 542.060, 0.1502, 0.2470, 0.8421, -20.4894));
         datums.put("potsdam", new SevenParameterDatum(

trunk/src/org/openstreetmap/josm/data/projection/proj/DoubleStereographic.java

@@ -63 +63 @@
         double e2 = ellps.e2;
         R = sqrt(1-e2) / (1 - e2*pow(sin(phi0), 2));
-        n = sqrt(1 + ellps.eb2 * pow(cos(phi0),4));
+        n = sqrt(1 + ellps.eb2 * pow(cos(phi0), 4));
         double S1 = (1 + sin(phi0)) / (1 - sin(phi0));
         double S2 = (1 - e * sin(phi0)) / (1 + e * sin(phi0));

trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java

@@ -27 +27 @@
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.projection.Projections;
-import org.openstreetmap.josm.gui.preferences.projection.ProjectionChoice;
-import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
 import org.openstreetmap.josm.io.UTFInputStreamReader;
 import org.openstreetmap.josm.tools.Predicate;

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

@@ -975 +975 @@
     /**
      * Calculate area and perimeter length of a polygon.
-     * 
+     *
      * Uses current projection; units are that of the projected coordinates.
-     * 
+     *
      * @param nodes the list of nodes representing the polygon
      * @return area and perimeter
@@ -988 +988 @@
             int numSegments = closed ? nodes.size() - 1 : nodes.size();
             EastNorth p1 = nodes.get(0).getEastNorth();
-            for (int i=1; i<=numSegments; i++) {
+            for (int i = 1; i <= numSegments; i++) {
                 EastNorth p2 = nodes.get(i == numSegments ? 0 : i).getEastNorth();
                 area += p1.east() * p2.north() - p2.east() * p1.north();