Changeset 30319 in osm


Ignore:
Timestamp:
2014-03-10T02:36:47+01:00 (10 years ago)
Author:
donvip
Message:

[josm_plugins] update to JOSM 6906

Location:
applications/editors/josm/plugins
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/CommandLine/build.xml

    r30203 r30319  
    44    <property name="commit.message" value="JOSM/CommandLine: fix exception after JOSM update"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="6690"/>
     6    <property name="plugin.main.version" value="6906"/>
    77
    88    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/CommandLine/src/CommandLine/OsmToCmd.java

    r30145 r30319  
    4141import org.openstreetmap.josm.data.osm.WayData;
    4242import org.openstreetmap.josm.io.IllegalDataException;
    43 import org.openstreetmap.josm.io.OsmDataParsingException;
    4443import org.openstreetmap.josm.io.UTFInputStreamReader;
    4544import org.openstreetmap.josm.tools.DateUtils;
     45import org.openstreetmap.josm.tools.XmlParsingException;
    4646import org.xml.sax.Attributes;
    4747import org.xml.sax.InputSource;
    … …  
    9494        }
    9595
    96         protected void throwException(String msg) throws OsmDataParsingException {
    97             throw new OsmDataParsingException(msg).rememberLocation(locator);
     96        protected void throwException(String msg) throws XmlParsingException {
     97            throw new XmlParsingException(msg).rememberLocation(locator);
    9898        }
    9999

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

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

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

    r28503 r30319  
    2424import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
    2525import org.openstreetmap.josm.gui.progress.ProgressMonitor;
    26 import org.openstreetmap.josm.io.OsmDataParsingException;
    2726import org.openstreetmap.josm.tools.CheckParameterUtil;
    2827import org.openstreetmap.josm.tools.DateUtils;
     28import org.openstreetmap.josm.tools.XmlParsingException;
    2929import org.xml.sax.Attributes;
    3030import org.xml.sax.InputSource;
    … …  
    5959        }
    6060
    61         protected void throwException(String message) throws OsmDataParsingException {
    62             throw new OsmDataParsingException(
     61        protected void throwException(String message) throws XmlParsingException {
     62            throw new XmlParsingException(
    6363                    message
    6464            ).rememberLocation(locator);
    6565        }
    6666
    67         protected void throwException(Exception e) throws OsmDataParsingException {
    68             throw new OsmDataParsingException(
     67        protected void throwException(Exception e) throws XmlParsingException {
     68            throw new XmlParsingException(
    6969                    e
    7070            ).rememberLocation(locator);
    7171        }
    7272
    73         protected long getMandatoryAttributeLong(Attributes attr, String name) throws SAXException{
     73        protected long getMandatoryAttributeLong(Attributes attr, String name) throws SAXException {
    7474            String v = attr.getValue(name);
    7575            if (v == null) {
    … …  
    300300     * if null
    301301     * @return the parsed data
    302      * @throws OsmDataParsingException thrown if something went wrong. Check for chained
    303      * exceptions.
     302     * @throws XmlParsingException if something went wrong. Check for chained exceptions.
    304303     */
    305     public ChangesetDataSet parse(ProgressMonitor progressMonitor) throws OsmDataParsingException {
     304    public ChangesetDataSet parse(ProgressMonitor progressMonitor) throws XmlParsingException {
    306305        if (progressMonitor == null) {
    307306            progressMonitor = NullProgressMonitor.INSTANCE;
    … …  
    311310            progressMonitor.indeterminateSubTask(tr("Parsing changeset content ..."));
    312311            SAXParserFactory.newInstance().newSAXParser().parse(source, new Parser());
    313         } catch(OsmDataParsingException e){
     312        } catch(XmlParsingException e){
    314313            throw e;
    315314        } catch (ParserConfigurationException e) {
    316             throw new OsmDataParsingException(e);
     315            throw new XmlParsingException(e);
    317316        } catch(SAXException e) {
    318             throw new OsmDataParsingException(e);
     317            throw new XmlParsingException(e);
    319318        } catch(IOException e) {
    320             throw new OsmDataParsingException(e);
     319            throw new XmlParsingException(e);
    321320        } finally {
    322321            progressMonitor.finishTask();
    … …  
    329328     *
    330329     * @return the parsed data
    331      * @throws OsmDataParsingException thrown if something went wrong. Check for chained
    332      * exceptions.
     330     * @throws XmlParsingException if something went wrong. Check for chained exceptions.
    333331     */
    334     public ChangesetDataSet parse() throws OsmDataParsingException {
     332    public ChangesetDataSet parse() throws XmlParsingException {
    335333        return parse(null);
    336334    }

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

    r23273 r30319  
    2121import org.openstreetmap.josm.io.IllegalDataException;
    2222import org.openstreetmap.josm.io.OsmChangesetParser;
    23 import org.openstreetmap.josm.io.OsmDataParsingException;
    2423import org.openstreetmap.josm.io.OsmServerReader;
    2524import org.openstreetmap.josm.io.OsmTransferException;
    2625import org.openstreetmap.josm.tools.CheckParameterUtil;
     26import org.openstreetmap.josm.tools.XmlParsingException;
    2727
    2828/**
    … …  
    194194        } catch(UnsupportedEncodingException e) {
    195195            throw new OsmTransferException(e);
    196         } catch(OsmDataParsingException e) {
     196        } catch(XmlParsingException e) {
    197197            throw new OsmTransferException(e);
    198198        } finally {

  • applications/editors/josm/plugins/roadsigns/build.xml

    r30250 r30319  
    44    <property name="commit.message" value="preset maintenance (Fahrradstraße)"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="6340"/>
     6    <property name="plugin.main.version" value="6906"/>
    77
    88    <!--

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

    r29854 r30319  
    2121import org.xml.sax.SAXParseException;
    2222import org.xml.sax.helpers.DefaultHandler;
    23 
    2423import org.openstreetmap.josm.Main;
    25 import org.openstreetmap.josm.io.OsmDataParsingException;
    2624import org.openstreetmap.josm.plugins.roadsigns.Sign.SignParameter;
    2725import org.openstreetmap.josm.plugins.roadsigns.Sign.Tag;
    … …  
    2927import org.openstreetmap.josm.plugins.roadsigns.javacc.TokenMgrError;
    3028import org.openstreetmap.josm.tools.LanguageInfo;
     29import org.openstreetmap.josm.tools.XmlParsingException;
    3130
    3231/**
    … …  
    202201        }
    203202
    204         private String getMandatoryAttribute(Attributes atts, String ident) throws OsmDataParsingException {
     203        private String getMandatoryAttribute(Attributes atts, String ident) throws XmlParsingException {
    205204            String result = atts.getValue(ident);
    206205            if (result == null) {
    … …  
    223222            throw new ExtendedParsingException(e).rememberLocation(locator);
    224223        }
    225         protected void throwException(String msg) throws OsmDataParsingException {
    226             throw new OsmDataParsingException(msg).rememberLocation(locator);
     224        protected void throwException(String msg) throws XmlParsingException {
     225            throw new XmlParsingException(msg).rememberLocation(locator);
    227226        }
    228227
    … …  
    230229            try {
    231230                throwException(s);
    232             } catch (OsmDataParsingException ex) {
     231            } catch (XmlParsingException ex) {
    233232                System.err.println("Warning: "+ex.getMessage());
    234233            }
    235234        }
    236         public void wireSupplements() throws OsmDataParsingException {
     235        public void wireSupplements() throws XmlParsingException {
    237236            Map<String, Sign> map = new HashMap<String, Sign>();
    238237            for (Sign sign : allSigns) {
Note: See TracChangeset for help on using the changeset viewer.