Changeset 15427 in josm for trunk

Timestamp:

2019-10-06T00:32:07+02:00 (5 years ago)

Author:

Don-vip

Message:

fix recent SonarQube issues

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/SimplifyWayAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/SystemOfMeasurement.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/gpx/GpxData.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/validation/tests/SharpAngles.java (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/io/importexport/GeoJSONImporter.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/GeoJSONReader.java (modified) (4 diffs)
• src/org/openstreetmap/josm/io/GeoJSONServerReader.java (modified) (2 diffs)
• src/org/openstreetmap/josm/tools/XmlObjectParser.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/io/GeoJSONReaderTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java

@@ -184 +184 @@
 
             String lengthstr = SystemOfMeasurement.getSystemOfMeasurement().getDistText(
-                    ways.stream().collect(
-                            Collectors.summingDouble(w -> {
-                                return w.getLength();
-                            })));
+                    ways.stream().mapToDouble(Way::getLength).sum());
 
             double err = askSimplifyWays(trn(

trunk/src/org/openstreetmap/josm/data/SystemOfMeasurement.java

@@ -5 +5 @@
 
 import java.text.NumberFormat;
+import java.util.Collections;
 import java.util.Locale;
 import java.util.Map;
@@ -73 +74 @@
      * @since 3406
      */
-    public static final Map<String, SystemOfMeasurement> ALL_SYSTEMS = Stream.of(METRIC, CHINESE, IMPERIAL, NAUTICAL_MILE)
-            .collect(Collectors.toMap(SystemOfMeasurement::getName, Function.identity()));
+    public static final Map<String, SystemOfMeasurement> ALL_SYSTEMS = Collections.unmodifiableMap(
+            Stream.of(METRIC, CHINESE, IMPERIAL, NAUTICAL_MILE)
+            .collect(Collectors.toMap(SystemOfMeasurement::getName, Function.identity())));
 
     /**

trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java

@@ -436 +436 @@
 
     /**
+     * Ensures a unique name among gpx layers
      * @param attrs attributes of/for an gpx track, written to if the name appeared previously in {@code counts}.
      * @param counts a {@code HashMap} of previously seen names, associated with their count.

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

@@ -9 +9 @@
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.TreeSet;
 
@@ -20 +21 @@
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.tools.Geometry;
-import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.bugreport.BugReport;
 
 /**
@@ -56 +57 @@
             try {
                 checkWayForSharpAngles(way);
-            } catch (Exception e) {
-                Logging.error("Way https://osm.org/way/{0} caused an error ({1})", way.getUniqueId(), e);
-                throw e;
+            } catch (RuntimeException e) {
+                throw BugReport.intercept(e).put("way", way);
             }
         }
@@ -159 +159 @@
         severityBreakPoints.put(maxAngle * 2 / 3, Severity.WARNING);
     }
+
+    @Override
+    public int hashCode() {
+        return 31 * super.hashCode() + Objects.hash(ignoreHighways, maxAngle, maxLength);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (!super.equals(obj) || getClass() != obj.getClass())
+            return false;
+        SharpAngles other = (SharpAngles) obj;
+        return Objects.equals(ignoreHighways, other.ignoreHighways)
+                && Double.doubleToLongBits(maxAngle) == Double.doubleToLongBits(other.maxAngle)
+                && Double.doubleToLongBits(maxLength) == Double.doubleToLongBits(other.maxLength);
+    }
 }
-

trunk/src/org/openstreetmap/josm/gui/io/importexport/GeoJSONImporter.java

@@ -52 +52 @@
             progressMonitor.worked(1);
             MainApplication.getLayerManager().addLayer(new OsmDataLayer(data, file.getName(), file));
-        } catch (final Exception e) {
+        } catch (IOException | IllegalDataException e) {
             Logging.error("Error while reading json file!");
             Logging.error(e);

trunk/src/org/openstreetmap/josm/io/GeoJSONReader.java

@@ -89 +89 @@
     private void parseFeature(final JsonObject feature) {
         JsonValue geometry = feature.get(GEOMETRY);
-        if (geometry != null && geometry.getValueType().equals(JsonValue.ValueType.OBJECT)) {
+        if (geometry != null && geometry.getValueType() == JsonValue.ValueType.OBJECT) {
             parseGeometry(feature, geometry.asJsonObject());
         } else {
             JsonValue properties = feature.get(PROPERTIES);
-            if (properties != null && properties.getValueType().equals(JsonValue.ValueType.OBJECT)) {
+            if (properties != null && properties.getValueType() == JsonValue.ValueType.OBJECT) {
                 parseNonGeometryFeature(feature, properties.asJsonObject());
             } else {
@@ -104 +104 @@
         // get relation type
         JsonValue type = properties.get(TYPE);
-        if (type == null || properties.getValueType().equals(JsonValue.ValueType.STRING)) {
+        if (type == null || properties.getValueType() == JsonValue.ValueType.STRING) {
             Logging.warn(tr("Relation/non-geometry feature without type found: {0}", feature));
             return;
@@ -258 +258 @@
     }
 
-    private void fillTagsFromFeature(final JsonObject feature, final OsmPrimitive primitive) {
+    private static void fillTagsFromFeature(final JsonObject feature, final OsmPrimitive primitive) {
         if (feature != null) {
             primitive.setKeys(getTags(feature));
@@ -264 +264 @@
     }
 
-    private void parseUnknown(final JsonObject object) {
+    private static void parseUnknown(final JsonObject object) {
         Logging.warn(tr("Unknown json object found {0}", object));
     }
 
-    private void parseNullGeometry(JsonObject feature) {
+    private static void parseNullGeometry(JsonObject feature) {
         Logging.warn(tr("Geometry of feature {0} is null", feature));
     }
 
-    private Map<String, String> getTags(final JsonObject feature) {
+    private static Map<String, String> getTags(final JsonObject feature) {
         final Map<String, String> tags = new TreeMap<>();
 
         if (feature.containsKey(PROPERTIES) && !feature.isNull(PROPERTIES)) {
             JsonValue properties = feature.get(PROPERTIES);
-            if (properties != null && JsonValue.ValueType.OBJECT.equals(properties.getValueType())) {
+            if (properties != null && properties.getValueType() == JsonValue.ValueType.OBJECT) {
                 for (Map.Entry<String, JsonValue> stringJsonValueEntry : properties.asJsonObject().entrySet()) {
                     final JsonValue value = stringJsonValueEntry.getValue();

trunk/src/org/openstreetmap/josm/io/GeoJSONServerReader.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.io.IOException;
 import java.util.Objects;
 
@@ -32 +33 @@
             progressMonitor.beginTask(tr("Contacting Server…"), 10);
             return new GeoJSONImporter().parseDataSet(url);
-        } catch (Exception e) {
+        } catch (IOException | IllegalDataException e) {
             throw new OsmTransferException(e);
         } finally {

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

@@ -140 +140 @@
                 fieldName += '_';
             }
-            fieldName = fieldName.replaceAll(":", "_");
+            fieldName = fieldName.replace(':', '_');
             try {
                 Object c = current.peek();

trunk/test/unit/org/openstreetmap/josm/io/GeoJSONReaderTest.java

@@ -39 +39 @@
      */
     @Test
-    public void test() throws Exception {
+    public void testReadGeoJson() throws Exception {
         try (InputStream in = Files.newInputStream(Paths.get(TestUtils.getTestDataRoot(), "geo.json"))) {
             final List<OsmPrimitive> primitives = new ArrayList<>(new GeoJSONReader()