Changeset 30319 in osm for applications/editors/josm/plugins/reverter

Timestamp:

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

Author:

donvip

Message:

[josm_plugins] update to JOSM 6906

Location:

applications/editors/josm/plugins/reverter

Files:

• build.xml (modified) (1 diff)
• src/reverter/corehacks/OsmChangesetContentParser.java (modified) (5 diffs)
• src/reverter/corehacks/OsmServerChangesetReader.java (modified) (2 diffs)

applications/editors/josm/plugins/reverter/build.xml

@@ -4 +4 @@
     <property name="commit.message" value="Reverter: Update MultiOsmReader to support null data after redaction"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6887"/>
+    <property name="plugin.main.version" value="6906"/>
 
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/reverter/src/reverter/corehacks/OsmChangesetContentParser.java

@@ -24 +24 @@
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
-import org.openstreetmap.josm.io.OsmDataParsingException;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.DateUtils;
+import org.openstreetmap.josm.tools.XmlParsingException;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
@@ -59 +59 @@
         }
 
-        protected void throwException(String message) throws OsmDataParsingException {
-            throw new OsmDataParsingException(
+        protected void throwException(String message) throws XmlParsingException {
+            throw new XmlParsingException(
                     message
             ).rememberLocation(locator);
         }
 
-        protected void throwException(Exception e) throws OsmDataParsingException {
-            throw new OsmDataParsingException(
+        protected void throwException(Exception e) throws XmlParsingException {
+            throw new XmlParsingException(
                     e
             ).rememberLocation(locator);
         }
 
-        protected long getMandatoryAttributeLong(Attributes attr, String name) throws SAXException{
+        protected long getMandatoryAttributeLong(Attributes attr, String name) throws SAXException {
             String v = attr.getValue(name);
             if (v == null) {
@@ -300 +300 @@
      * if null
      * @return the parsed data
-     * @throws OsmDataParsingException thrown if something went wrong. Check for chained
-     * exceptions.
+     * @throws XmlParsingException if something went wrong. Check for chained exceptions.
      */
-    public ChangesetDataSet parse(ProgressMonitor progressMonitor) throws OsmDataParsingException {
+    public ChangesetDataSet parse(ProgressMonitor progressMonitor) throws XmlParsingException {
         if (progressMonitor == null) {
             progressMonitor = NullProgressMonitor.INSTANCE;
@@ -311 +310 @@
             progressMonitor.indeterminateSubTask(tr("Parsing changeset content ..."));
             SAXParserFactory.newInstance().newSAXParser().parse(source, new Parser());
-        } catch(OsmDataParsingException e){
+        } catch(XmlParsingException e){
             throw e;
         } catch (ParserConfigurationException e) {
-            throw new OsmDataParsingException(e);
+            throw new XmlParsingException(e);
         } catch(SAXException e) {
-            throw new OsmDataParsingException(e);
+            throw new XmlParsingException(e);
         } catch(IOException e) {
-            throw new OsmDataParsingException(e);
+            throw new XmlParsingException(e);
         } finally {
             progressMonitor.finishTask();
@@ -329 +328 @@
      *
      * @return the parsed data
-     * @throws OsmDataParsingException thrown if something went wrong. Check for chained
-     * exceptions.
+     * @throws XmlParsingException if something went wrong. Check for chained exceptions.
      */
-    public ChangesetDataSet parse() throws OsmDataParsingException {
+    public ChangesetDataSet parse() throws XmlParsingException {
         return parse(null);
     }

applications/editors/josm/plugins/reverter/src/reverter/corehacks/OsmServerChangesetReader.java

@@ -21 +21 @@
 import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.io.OsmChangesetParser;
-import org.openstreetmap.josm.io.OsmDataParsingException;
 import org.openstreetmap.josm.io.OsmServerReader;
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.XmlParsingException;
 
 /**
@@ -194 +194 @@
         } catch(UnsupportedEncodingException e) {
             throw new OsmTransferException(e);
-        } catch(OsmDataParsingException e) {
+        } catch(XmlParsingException e) {
             throw new OsmTransferException(e);
         } finally {