Changeset 10000 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2016-03-16T01:17:59+01:00 (8 years ago)

Author:

Don-vip

Message:

sonar - fix various issues

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• imagery/ImageryLayerInfo.java (modified) (1 diff)
• imagery/WMTSTileSource.java (modified) (1 diff)
• osm/visitor/paint/StyledMapRenderer.java (modified) (1 diff)
• osm/visitor/paint/relations/MultipolygonCache.java (modified) (1 diff)
• projection/CustomProjection.java (modified) (3 diffs)
• projection/proj/ObliqueMercator.java (modified) (1 diff)
• validation/tests/MultipolygonTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java

@@ -274 +274 @@
     }
 
-    private boolean isSimilar(ImageryInfo iiA, ImageryInfo iiB) {
+    private static boolean isSimilar(ImageryInfo iiA, ImageryInfo iiB) {
         if (iiA == null)
             return false;

trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java

@@ -293 +293 @@
         XMLInputFactory factory = XMLInputFactory.newFactory();
         // do not try to load external entities, nor validate the XML
-        factory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, false);
-        factory.setProperty(XMLInputFactory.IS_VALIDATING, false);
-        factory.setProperty(XMLInputFactory.SUPPORT_DTD, false);
+        factory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, Boolean.FALSE);
+        factory.setProperty(XMLInputFactory.IS_VALIDATING, Boolean.FALSE);
+        factory.setProperty(XMLInputFactory.SUPPORT_DTD, Boolean.FALSE);
 
         try (CachedFile cf = new CachedFile(baseUrl); InputStream in = cf.setHttpHeaders(headers).

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -391 +391 @@
     }
 
-    private Polygon buildPolygon(Point center, int radius, int sides) {
+    private static Polygon buildPolygon(Point center, int radius, int sides) {
         return buildPolygon(center, radius, sides, 0.0);
     }

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java

@@ -189 +189 @@
     }
 
-    private void processEvent(AbstractDatasetChangedEvent event, Relation r, Collection<Map<Relation, Multipolygon>> maps) {
+    private static void processEvent(AbstractDatasetChangedEvent event, Relation r, Collection<Map<Relation, Multipolygon>> maps) {
         if (event instanceof NodeMovedEvent || event instanceof WayNodesChangedEvent) {
             dispatchEvent(event, r, maps);

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

@@ -571 +571 @@
         }
         if (parameters.containsKey(Param.no_off.key) || parameters.containsKey(Param.no_uoff.key)) {
-            projParams.no_off = true;
+            projParams.no_off = Boolean.TRUE;
         }
         proj.initialize(projParams);
@@ -713 +713 @@
     /**
      * Factor to convert units of east/north coordinates to meters.
-     * 
+     *
      * When east/north coordinates are in degrees (geographic CRS), the scale
      * at the equator is taken, i.e. 360 degrees corresponds to the length of
      * the equator in meters.
-     * 
+     *
      * @return factor to convert units to meter
      */
@@ -780 +780 @@
     }
 
-    private EastNorth getPointAlong(int i, int N, ProjectionBounds r) {
+    private static EastNorth getPointAlong(int i, int N, ProjectionBounds r) {
         double dEast = (r.maxEast - r.minEast) / N;
         double dNorth = (r.maxNorth - r.minNorth) / N;

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

@@ -368 +368 @@
     }
 
-    private double normalizeLonRad(double a) {
+    private static double normalizeLonRad(double a) {
         return Math.toRadians(LatLon.normalizeLon(Math.toDegrees(a)));
     }

trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java

@@ -114 +114 @@
     }
 
-    private List<GeneralPath> createPolygons(List<Multipolygon.PolyData> joinedWays) {
+    private static List<GeneralPath> createPolygons(List<Multipolygon.PolyData> joinedWays) {
         List<GeneralPath> result = new ArrayList<>();
         for (Multipolygon.PolyData way : joinedWays) {