Changeset 9618 in josm for trunk

Timestamp:

2016-01-24T21:30:11+01:00 (8 years ago)

Author:

stoecker

Message:

fix Jenkins warning, coding style fixes

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• Preferences.java (modified) (2 diffs)
• osm/DataSet.java (modified) (1 diff)

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

@@ -1418 +1418 @@
                 if (evalue instanceof Collection) {
                     JsonArrayBuilder a = Json.createArrayBuilder();
-                    for (Object evo : (Collection)evalue) {
+                    for (Object evo: (Collection) evalue) {
                         a.add(evo.toString());
                     }
@@ -1440 +1440 @@
                 JsonValue value = e.getValue();
                 if (value instanceof JsonArray) {
-                    List <String> finalList = new ArrayList<String>();
-                    for(JsonString js: ((JsonArray)value).getValuesAs(JsonString.class)) {
+                    List<String> finalList = new ArrayList<String>();
+                    for (JsonString js: ((JsonArray) value).getValuesAs(JsonString.class)) {
                         finalList.add(js.getString());
                     }

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -1253 +1253 @@
         try {
             if (cleanupDeleted(nodes.iterator())
-                    | cleanupDeleted(ways.iterator())
-                    | cleanupDeleted(relations.iterator())) {
+                    || cleanupDeleted(ways.iterator())
+                    || cleanupDeleted(relations.iterator())) {
                 fireSelectionChanged();
             }