Changeset 30319 in osm for applications/editors/josm/plugins/roadsigns/src/org/openstreetmap

Timestamp:

2014-03-10T02:36:47+01:00 (11 years ago)

Author:

donvip

Message:

[josm_plugins] update to JOSM 6906

File:

• applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java (modified) (5 diffs)

applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java

@@ -21 +21 @@
 import org.xml.sax.SAXParseException;
 import org.xml.sax.helpers.DefaultHandler;
-
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.io.OsmDataParsingException;
 import org.openstreetmap.josm.plugins.roadsigns.Sign.SignParameter;
 import org.openstreetmap.josm.plugins.roadsigns.Sign.Tag;
@@ -29 +27 @@
 import org.openstreetmap.josm.plugins.roadsigns.javacc.TokenMgrError;
 import org.openstreetmap.josm.tools.LanguageInfo;
+import org.openstreetmap.josm.tools.XmlParsingException;
 
 /**
@@ -202 +201 @@
         }
 
-        private String getMandatoryAttribute(Attributes atts, String ident) throws OsmDataParsingException {
+        private String getMandatoryAttribute(Attributes atts, String ident) throws XmlParsingException {
             String result = atts.getValue(ident);
             if (result == null) {
@@ -223 +222 @@
             throw new ExtendedParsingException(e).rememberLocation(locator);
         }
-        protected void throwException(String msg) throws OsmDataParsingException {
-            throw new OsmDataParsingException(msg).rememberLocation(locator);
+        protected void throwException(String msg) throws XmlParsingException {
+            throw new XmlParsingException(msg).rememberLocation(locator);
         }
 
@@ -230 +229 @@
             try {
                 throwException(s);
-            } catch (OsmDataParsingException ex) {
+            } catch (XmlParsingException ex) {
                 System.err.println("Warning: "+ex.getMessage());
             }
         }
-        public void wireSupplements() throws OsmDataParsingException {
+        public void wireSupplements() throws XmlParsingException {
             Map<String, Sign> map = new HashMap<String, Sign>();
             for (Sign sign : allSigns) {