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

Timestamp:

2015-05-02T00:55:19+02:00 (9 years ago)

Author:

Don-vip

Message:

fix potential NPEs and Sonar issues related to serialization

File:

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

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

@@ -25 +25 @@
  */
 public abstract class AbstractParser extends DefaultHandler {
-    
+
     /** the current primitive to be read */
     protected HistoryOsmPrimitive currentPrimitive;
@@ -34 +34 @@
         this.locator = locator;
     }
-    
+
     protected abstract void throwException(String message) throws SAXException;
+
+    protected abstract void throwException(String message, Exception e) throws SAXException;
 
     protected final long getMandatoryAttributeLong(Attributes attr, String name) throws SAXException {
@@ -46 +48 @@
             l = Long.parseLong(v);
         } catch(NumberFormatException e) {
-            throwException(tr("Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''.", name, v));
+            throwException(tr("Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''.", name, v), e);
         }
         if (l < 0) {
@@ -62 +64 @@
             l = Long.parseLong(v);
         } catch(NumberFormatException e) {
-            throwException(tr("Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''.", name, v));
+            throwException(tr("Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''.", name, v), e);
         }
         if (l < 0) {
@@ -79 +81 @@
             d = Double.parseDouble(v);
         } catch(NumberFormatException e) {
-            throwException(tr("Illegal value for attribute ''{0}'' of type double. Got ''{1}''.", name, v));
+            throwException(tr("Illegal value for attribute ''{0}'' of type double. Got ''{1}''.", name, v), e);
         }
         return d;
@@ -102 +104 @@
         return false; // not reached
     }
-    
+
     protected final HistoryOsmPrimitive createPrimitive(Attributes atts, OsmPrimitiveType type) throws SAXException {
         long id = getMandatoryAttributeLong(atts,"id");
@@ -152 +154 @@
         currentPrimitive = createPrimitive(atts, OsmPrimitiveType.WAY);
     }
-    
+
     protected final void startRelation(Attributes atts) throws SAXException {
         currentPrimitive = createPrimitive(atts, OsmPrimitiveType.RELATION);
@@ -175 +177 @@
             type = OsmPrimitiveType.fromApiTypeName(v);
         } catch(IllegalArgumentException e) {
-            throwException(tr("Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got ''{1}''.", "type", v));
+            throwException(tr("Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got ''{1}''.", "type", v), e);
         }
         String role = getMandatoryAttributeString(atts, "role");
@@ -181 +183 @@
         ((HistoryRelation)currentPrimitive).addMember(member);
     }
-    
+
     protected final boolean doStartElement(String qName, Attributes atts) throws SAXException {
         switch (qName) {