Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/io/AbstractParser.java

Timestamp:

2015-06-20T23:42:21+02:00 (11 years ago)

Author:

Don-vip

Message:

checkstyle: enable relevant whitespace checks and fix them

File:

• trunk/src/org/openstreetmap/josm/io/AbstractParser.java (modified) (7 diffs)

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

@@ -47 +47 @@
         try {
             l = Long.parseLong(v);
-        } catch(NumberFormatException e) {
+        } catch (NumberFormatException e) {
             throwException(tr("Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''.", name, v), e);
         }
@@ -63 +63 @@
         try {
             l = Long.valueOf(v);
-        } catch(NumberFormatException e) {
+        } catch (NumberFormatException e) {
             throwException(tr("Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''.", name, v), e);
         }
@@ -80 +80 @@
         try {
             d = Double.parseDouble(v);
-        } catch(NumberFormatException e) {
+        } catch (NumberFormatException e) {
             throwException(tr("Illegal value for attribute ''{0}'' of type double. Got ''{1}''.", name, v), e);
         }
@@ -106 +106 @@
 
     protected final HistoryOsmPrimitive createPrimitive(Attributes atts, OsmPrimitiveType type) throws SAXException {
-        long id = getMandatoryAttributeLong(atts,"id");
-        long version = getMandatoryAttributeLong(atts,"version");
-        long changesetId = getMandatoryAttributeLong(atts,"changeset");
-        boolean visible= getMandatoryAttributeBoolean(atts, "visible");
+        long id = getMandatoryAttributeLong(atts, "id");
+        long version = getMandatoryAttributeLong(atts, "version");
+        long changesetId = getMandatoryAttributeLong(atts, "changeset");
+        boolean visible = getMandatoryAttributeBoolean(atts, "visible");
 
         Long uid = getAttributeLong(atts, "uid");
@@ -130 +130 @@
             Double lat = getAttributeDouble(atts, "lat");
             Double lon = getAttributeDouble(atts, "lon");
-            LatLon coor = (lat != null && lon != null) ? new LatLon(lat,lon) : null;
-            primitive = new HistoryNode(
-                    id,version,visible,user,changesetId,timestamp,coor
-            );
+            LatLon coor = (lat != null && lon != null) ? new LatLon(lat, lon) : null;
+            primitive = new HistoryNode(id, version, visible, user, changesetId, timestamp, coor);
 
         } else if (type.equals(OsmPrimitiveType.WAY)) {
-            primitive = new HistoryWay(
-                    id,version,visible,user,changesetId,timestamp
-            );
+            primitive = new HistoryWay(id, version, visible, user, changesetId, timestamp);
         } else if (type.equals(OsmPrimitiveType.RELATION)) {
-            primitive = new HistoryRelation(
-                    id,version,visible,user,changesetId,timestamp
-            );
+            primitive = new HistoryRelation(id, version, visible, user, changesetId, timestamp);
         }
         return primitive;
@@ -162 +156 @@
         String key = getMandatoryAttributeString(atts, "k");
         String value = getMandatoryAttributeString(atts, "v");
-        currentPrimitive.put(key,value);
+        currentPrimitive.put(key, value);
     }
 
     protected final void handleNodeReference(Attributes atts) throws SAXException {
         long ref = getMandatoryAttributeLong(atts, "ref");
-        ((HistoryWay)currentPrimitive).addNode(ref);
+        ((HistoryWay) currentPrimitive).addNode(ref);
     }
 
@@ -176 +170 @@
         try {
             type = OsmPrimitiveType.fromApiTypeName(v);
-        } catch(IllegalArgumentException e) {
+        } catch (IllegalArgumentException e) {
             throwException(tr("Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got ''{1}''.", "type", v), e);
         }
         String role = getMandatoryAttributeString(atts, "role");
-        RelationMemberData member = new RelationMemberData(role, type,ref);
-        ((HistoryRelation)currentPrimitive).addMember(member);
+        RelationMemberData member = new RelationMemberData(role, type, ref);
+        ((HistoryRelation) currentPrimitive).addMember(member);
     }