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

Timestamp:

2017-05-30T15:12:36+02:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S3878 - Arrays should not be created for varargs parameters

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• cache/CacheEntryAttributes.java (modified) (2 diffs)
• imagery/GetCapabilitiesParseHelper.java (modified) (1 diff)
• imagery/WMTSTileSource.java (modified) (3 diffs)
• osm/visitor/paint/MapRendererFactory.java (modified) (1 diff)
• projection/datum/SevenParameterDatum.java (modified) (2 diffs)
• validation/tests/TagChecker.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/cache/CacheEntryAttributes.java

@@ -30 +30 @@
     private static final String ERROR_MESSAGE = "errorMessage";
     // this contains all of the above
-    private static final Set<String> RESERVED_KEYS = new HashSet<>(Arrays.asList(new String[]{
+    private static final Set<String> RESERVED_KEYS = new HashSet<>(Arrays.asList(
         NO_TILE_AT_ZOOM,
         ETAG,
@@ -37 +37 @@
         HTTP_RESPONSE_CODE,
         ERROR_MESSAGE
-    }));
-
+    ));
 
     /**

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

@@ -177 +177 @@
             if (event == XMLStreamReader.START_ELEMENT && QN_OWS_CONSTRAINT.equals(reader.getName())
              && "GetEncoding".equals(reader.getAttributeValue("", "name"))) {
-                moveReaderToTag(reader, new QName[]{
-                        QN_OWS_ALLOWED_VALUES,
-                        QN_OWS_VALUE
-                });
+                moveReaderToTag(reader, QN_OWS_ALLOWED_VALUES, QN_OWS_VALUE);
                 return TransferMode.fromString(reader.getElementText());
             }

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

@@ -194 +194 @@
 
         SelectLayerDialog(Collection<Layer> layers) {
-            super(Main.parent, tr("Select WMTS layer"), new String[]{tr("Add layers"), tr("Cancel")});
+            super(Main.parent, tr("Select WMTS layer"), tr("Add layers"), tr("Cancel"));
             this.layers = groupLayersByNameAndTileMatrixSet(layers);
             //getLayersTable(layers, Main.getProjection())
@@ -464 +464 @@
                     } else if (QN_STYLE.equals(reader.getName()) &&
                             "true".equals(reader.getAttributeValue("", "isDefault"))) {
-                        if (GetCapabilitiesParseHelper.moveReaderToTag(reader, new QName[] {GetCapabilitiesParseHelper.QN_OWS_IDENTIFIER})) {
+                        if (GetCapabilitiesParseHelper.moveReaderToTag(reader, GetCapabilitiesParseHelper.QN_OWS_IDENTIFIER)) {
                             layer.style = reader.getElementText();
                             tagStack.push(reader.getName()); // keep tagStack in sync
@@ -636 +636 @@
                     GetCapabilitiesParseHelper.QN_OWS_OPERATION.equals(reader.getName()) &&
                     "GetTile".equals(reader.getAttributeValue("", "name")) &&
-                    GetCapabilitiesParseHelper.moveReaderToTag(reader, new QName[] {
+                    GetCapabilitiesParseHelper.moveReaderToTag(reader,
                             GetCapabilitiesParseHelper.QN_OWS_DCP,
                             GetCapabilitiesParseHelper.QN_OWS_HTTP,
-                            GetCapabilitiesParseHelper.QN_OWS_GET,
-                    })) {
+                            GetCapabilitiesParseHelper.QN_OWS_GET
+                    )) {
                 this.baseUrl = reader.getAttributeValue(GetCapabilitiesParseHelper.XLINK_NS_URL, "href");
                 this.transferMode = GetCapabilitiesParseHelper.getTransferMode(reader);

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

@@ -303 +303 @@
     public AbstractMapRenderer createActiveRenderer(Graphics2D g, NavigatableComponent viewport, boolean isInactiveMode) {
         try {
-            Constructor<?> c = activeRenderer.getConstructor(new Class<?>[]{Graphics2D.class, NavigatableComponent.class, boolean.class});
+            Constructor<?> c = activeRenderer.getConstructor(Graphics2D.class, NavigatableComponent.class, boolean.class);
             return AbstractMapRenderer.class.cast(c.newInstance(g, viewport, isInactiveMode));
         } catch (InvocationTargetException e) {

trunk/src/org/openstreetmap/josm/data/projection/datum/SevenParameterDatum.java

@@ -52 +52 @@
         double y = dy + xyz[1]*(1+s) + xyz[0]*rz - xyz[2]*rx;
         double z = dz + xyz[2]*(1+s) + xyz[1]*rx - xyz[0]*ry;
-        return Ellipsoid.WGS84.cart2LatLon(new double[] {x, y, z});
+        return Ellipsoid.WGS84.cart2LatLon(x, y, z);
     }
 
@@ -61 +61 @@
         double y = (1-s)*(-dy + xyz[1] + ((-dx+xyz[0])*(-rz) - (-dz+xyz[2])*(-rx)));
         double z = (1-s)*(-dz + xyz[2] + ((-dy+xyz[1])*(-rx) - (-dx+xyz[0])*(-ry)));
-        return this.ellps.cart2LatLon(new double[] {x, y, z});
+        return this.ellps.cart2LatLon(x, y, z);
     }
 }

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

@@ -265 +265 @@
             // TODO directionKeys are no longer in OsmPrimitive (search pattern is used instead)
             for (String a : Main.pref.getCollection(ValidatorPreference.PREFIX + ".knownkeys",
-                    Arrays.asList(new String[]{"is_in", "int_ref", "fixme", "population"}))) {
+                    Arrays.asList("is_in", "int_ref", "fixme", "population"))) {
                 additionalPresetsValueData.putVoid(a);
             }