Ignore:
Timestamp:
2017-08-26T01:52:02+02:00 (7 years ago)
Author:
donvip
Message:

update to JOSM 12663

Location:
applications/editors/josm/plugins/utilsplugin2
Files:
16 edited

Legend:

Unmodified
Added
Removed

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

    r32725 r33522  
    55    <property name="commit.message" value="[josm_utilsplugin2]: select boundary by double-click; multitagger table highlights"/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="10658"/>
     7    <property name="plugin.main.version" value="12663"/>
    88
    99    <property name="plugin.author" value="Kalle Lampila, Upliner, Zverik, akks, joshdoe and others"/>

  • applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/UtilsPlugin2.java

    r32410 r33522  
    66
    77import org.openstreetmap.josm.Main;
    8 import org.openstreetmap.josm.actions.search.SearchCompiler;
     8import org.openstreetmap.josm.data.osm.search.SearchCompiler;
    99import org.openstreetmap.josm.gui.MainMenu;
    1010import org.openstreetmap.josm.gui.MapFrame;

  • applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/command/ChangeRelationMemberCommand.java

    r32725 r33522  
    99
    1010import org.openstreetmap.josm.command.Command;
     11import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
    1112import org.openstreetmap.josm.data.osm.OsmPrimitive;
    1213import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
    1314import org.openstreetmap.josm.data.osm.Relation;
    1415import org.openstreetmap.josm.data.osm.RelationMember;
    15 import org.openstreetmap.josm.gui.DefaultNameFormatter;
    1616
    1717/**

  • applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTagDialog.java

    r33296 r33522  
    4646import org.openstreetmap.josm.data.osm.OsmPrimitive;
    4747import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
     48import org.openstreetmap.josm.data.osm.search.SearchMode;
    4849import org.openstreetmap.josm.data.preferences.ColorProperty;
    4950import org.openstreetmap.josm.gui.ExtendedDialog;
    … …  
    313314        @Override
    314315        public void actionPerformed(ActionEvent e) {
    315             SearchAction.search(tableModel.getSearchExpression(), SearchAction.SearchMode.replace);
     316            SearchAction.search(tableModel.getSearchExpression(), SearchMode.replace);
    316317        }
    317318    }

  • applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceGeometryUtils.java

    r32410 r33522  
    2626import org.openstreetmap.josm.command.MoveCommand;
    2727import org.openstreetmap.josm.data.coor.LatLon;
     28import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
    2829import org.openstreetmap.josm.data.osm.Node;
    2930import org.openstreetmap.josm.data.osm.OsmPrimitive;
    … …  
    3233import org.openstreetmap.josm.data.osm.TagCollection;
    3334import org.openstreetmap.josm.data.osm.Way;
    34 import org.openstreetmap.josm.gui.DefaultNameFormatter;
    3535import org.openstreetmap.josm.gui.Notification;
    3636import org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog;

  • applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceMembershipAction.java

    r32410 r33522  
    1919import org.openstreetmap.josm.command.ChangeCommand;
    2020import org.openstreetmap.josm.command.Command;
     21import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
    2122import org.openstreetmap.josm.data.osm.OsmPrimitive;
    2223import org.openstreetmap.josm.data.osm.Relation;
    2324import org.openstreetmap.josm.data.osm.RelationMember;
    2425import org.openstreetmap.josm.data.osm.RelationToChildReference;
    25 import org.openstreetmap.josm.gui.DefaultNameFormatter;
    2626import org.openstreetmap.josm.gui.Notification;
    2727import org.openstreetmap.josm.tools.MultiMap;

  • applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/ChildrenMatch.java

    r32410 r33522  
    44import static org.openstreetmap.josm.tools.I18n.tr;
    55
    6 import org.openstreetmap.josm.actions.search.PushbackTokenizer;
    7 import org.openstreetmap.josm.actions.search.SearchCompiler;
    86import org.openstreetmap.josm.data.osm.OsmPrimitive;
    97import org.openstreetmap.josm.data.osm.Relation;
    108import org.openstreetmap.josm.data.osm.Way;
     9import org.openstreetmap.josm.data.osm.search.SearchParseError;
     10import org.openstreetmap.josm.data.osm.search.PushbackTokenizer;
    1111
    1212/**
    … …  
    1818    }
    1919
    20     public ChildrenMatch(PushbackTokenizer tokenizer) throws SearchCompiler.ParseError {
     20    public ChildrenMatch(PushbackTokenizer tokenizer) throws SearchParseError {
    2121        this(tokenizer.readRange(tr("Range of child primitives count")));
    2222    }

  • applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/ConnectedMatch.java

    r32410 r33522  
    77
    88import org.openstreetmap.josm.Main;
    9 import org.openstreetmap.josm.actions.search.SearchCompiler;
    109import org.openstreetmap.josm.data.osm.Node;
    1110import org.openstreetmap.josm.data.osm.OsmPrimitive;
    1211import org.openstreetmap.josm.data.osm.Way;
     12import org.openstreetmap.josm.data.osm.search.SearchCompiler;
    1313import org.openstreetmap.josm.plugins.utilsplugin2.selection.NodeWayUtils;
    1414

  • applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/InsideMatch.java

    r32410 r33522  
    66
    77import org.openstreetmap.josm.Main;
    8 import org.openstreetmap.josm.actions.search.SearchCompiler;
    98import org.openstreetmap.josm.data.osm.OsmPrimitive;
    109import org.openstreetmap.josm.data.osm.Relation;
    1110import org.openstreetmap.josm.data.osm.Way;
     11import org.openstreetmap.josm.data.osm.search.SearchCompiler;
    1212import org.openstreetmap.josm.plugins.utilsplugin2.selection.NodeWayUtils;
    1313

  • applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/IntersectingMatch.java

    r32410 r33522  
    77
    88import org.openstreetmap.josm.Main;
    9 import org.openstreetmap.josm.actions.search.SearchCompiler;
    109import org.openstreetmap.josm.data.osm.OsmPrimitive;
    1110import org.openstreetmap.josm.data.osm.Way;
     11import org.openstreetmap.josm.data.osm.search.SearchCompiler;
    1212import org.openstreetmap.josm.plugins.utilsplugin2.selection.NodeWayUtils;
    1313

  • applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/ParentsMatch.java

    r32725 r33522  
    44import static org.openstreetmap.josm.tools.I18n.tr;
    55
    6 import org.openstreetmap.josm.actions.search.PushbackTokenizer;
    7 import org.openstreetmap.josm.actions.search.SearchCompiler;
    86import org.openstreetmap.josm.data.osm.OsmPrimitive;
     7import org.openstreetmap.josm.data.osm.search.SearchParseError;
     8import org.openstreetmap.josm.data.osm.search.PushbackTokenizer;
    99
    1010/**
    … …  
    1616    }
    1717
    18     public ParentsMatch(PushbackTokenizer tokenizer) throws SearchCompiler.ParseError {
     18    public ParentsMatch(PushbackTokenizer tokenizer) throws SearchParseError {
    1919        this(tokenizer.readRange(tr("Range of parent primitives count")));
    2020    }

  • applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/RangeMatch.java

    r32410 r33522  
    22package org.openstreetmap.josm.plugins.utilsplugin2.search;
    33
    4 import org.openstreetmap.josm.actions.search.PushbackTokenizer;
    5 import org.openstreetmap.josm.actions.search.SearchCompiler;
    64import org.openstreetmap.josm.data.osm.OsmPrimitive;
     5import org.openstreetmap.josm.data.osm.search.PushbackTokenizer;
     6import org.openstreetmap.josm.data.osm.search.SearchCompiler;
    77
    88/**

  • applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/UsedInRelationsMatch.java

    r32725 r33522  
    44import static org.openstreetmap.josm.tools.I18n.tr;
    55
    6 import org.openstreetmap.josm.actions.search.PushbackTokenizer;
    7 import org.openstreetmap.josm.actions.search.SearchCompiler;
    86import org.openstreetmap.josm.data.osm.Changeset;
    97import org.openstreetmap.josm.data.osm.Node;
    … …  
    119import org.openstreetmap.josm.data.osm.Relation;
    1210import org.openstreetmap.josm.data.osm.Way;
     11import org.openstreetmap.josm.data.osm.search.SearchParseError;
     12import org.openstreetmap.josm.data.osm.search.PushbackTokenizer;
    1313import org.openstreetmap.josm.data.osm.visitor.Visitor;
    1414
    … …  
    2121    }
    2222
    23     public UsedInRelationsMatch(PushbackTokenizer tokenizer) throws SearchCompiler.ParseError {
     23    public UsedInRelationsMatch(PushbackTokenizer tokenizer) throws SearchParseError {
    2424        this(tokenizer.readRange(tr("Range of referencing relation count")));
    2525    }

  • applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/UsedInWaysMatch.java

    r32725 r33522  
    44import static org.openstreetmap.josm.tools.I18n.tr;
    55
    6 import org.openstreetmap.josm.actions.search.PushbackTokenizer;
    7 import org.openstreetmap.josm.actions.search.SearchCompiler;
    86import org.openstreetmap.josm.data.osm.Changeset;
    97import org.openstreetmap.josm.data.osm.Node;
    … …  
    119import org.openstreetmap.josm.data.osm.Relation;
    1210import org.openstreetmap.josm.data.osm.Way;
     11import org.openstreetmap.josm.data.osm.search.SearchParseError;
     12import org.openstreetmap.josm.data.osm.search.PushbackTokenizer;
    1313import org.openstreetmap.josm.data.osm.visitor.Visitor;
    1414
    … …  
    2121    }
    2222
    23     public UsedInWaysMatch(PushbackTokenizer tokenizer) throws SearchCompiler.ParseError {
     23    public UsedInWaysMatch(PushbackTokenizer tokenizer) throws SearchParseError {
    2424        this(tokenizer.readRange(tr("Range of attached ways count")));
    2525    }

  • applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/UtilsSimpleMatchFactory.java

    r32410 r33522  
    55import java.util.Collection;
    66
    7 import org.openstreetmap.josm.actions.search.PushbackTokenizer;
    8 import org.openstreetmap.josm.actions.search.SearchCompiler;
    9 import org.openstreetmap.josm.actions.search.SearchCompiler.SimpleMatchFactory;
     7import org.openstreetmap.josm.data.osm.search.SearchParseError;
     8import org.openstreetmap.josm.data.osm.search.PushbackTokenizer;
     9import org.openstreetmap.josm.data.osm.search.SearchCompiler;
     10import org.openstreetmap.josm.data.osm.search.SearchCompiler.SimpleMatchFactory;
    1011
    1112public class UtilsSimpleMatchFactory implements SimpleMatchFactory {
    … …  
    1920
    2021    @Override
    21     public SearchCompiler.Match get(String keyword, PushbackTokenizer tokenizer) throws SearchCompiler.ParseError {
     22    public SearchCompiler.Match get(String keyword, PushbackTokenizer tokenizer) throws SearchParseError {
    2223        if ("usedinways".equals(keyword)) {
    2324            return new UsedInWaysMatch(tokenizer);

  • applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/UtilsUnaryMatchFactory.java

    r32410 r33522  
    55import java.util.Collection;
    66
    7 import org.openstreetmap.josm.actions.search.PushbackTokenizer;
    8 import org.openstreetmap.josm.actions.search.SearchCompiler;
     7import org.openstreetmap.josm.data.osm.search.SearchParseError;
     8import org.openstreetmap.josm.data.osm.search.PushbackTokenizer;
     9import org.openstreetmap.josm.data.osm.search.SearchCompiler;
    910
    1011public class UtilsUnaryMatchFactory implements SearchCompiler.UnaryMatchFactory {
    … …  
    1516    @Override
    1617    public SearchCompiler.UnaryMatch get(String keyword, SearchCompiler.Match matchOperand, PushbackTokenizer tokenizer)
    17             throws SearchCompiler.ParseError {
     18            throws SearchParseError {
    1819        if ("inside".equals(keyword)) {
    1920            return new InsideMatch(matchOperand);
Note: See TracChangeset for help on using the changeset viewer.