Changeset 33522 in osm for applications/editors/josm/plugins/utilsplugin2
- Timestamp:
- 2017-08-26T01:52:02+02:00 (7 years ago)
- Location:
- applications/editors/josm/plugins/utilsplugin2
- Files:
-
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/utilsplugin2/build.xml
r32725 r33522 5 5 <property name="commit.message" value="[josm_utilsplugin2]: select boundary by double-click; multitagger table highlights"/> 6 6 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 7 <property name="plugin.main.version" value="1 0658"/>7 <property name="plugin.main.version" value="12663"/> 8 8 9 9 <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 6 6 7 7 import org.openstreetmap.josm.Main; 8 import org.openstreetmap.josm. actions.search.SearchCompiler;8 import org.openstreetmap.josm.data.osm.search.SearchCompiler; 9 9 import org.openstreetmap.josm.gui.MainMenu; 10 10 import org.openstreetmap.josm.gui.MapFrame; -
applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/command/ChangeRelationMemberCommand.java
r32725 r33522 9 9 10 10 import org.openstreetmap.josm.command.Command; 11 import org.openstreetmap.josm.data.osm.DefaultNameFormatter; 11 12 import org.openstreetmap.josm.data.osm.OsmPrimitive; 12 13 import org.openstreetmap.josm.data.osm.OsmPrimitiveType; 13 14 import org.openstreetmap.josm.data.osm.Relation; 14 15 import org.openstreetmap.josm.data.osm.RelationMember; 15 import org.openstreetmap.josm.gui.DefaultNameFormatter;16 16 17 17 /** -
applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTagDialog.java
r33296 r33522 46 46 import org.openstreetmap.josm.data.osm.OsmPrimitive; 47 47 import org.openstreetmap.josm.data.osm.OsmPrimitiveType; 48 import org.openstreetmap.josm.data.osm.search.SearchMode; 48 49 import org.openstreetmap.josm.data.preferences.ColorProperty; 49 50 import org.openstreetmap.josm.gui.ExtendedDialog; … … 313 314 @Override 314 315 public void actionPerformed(ActionEvent e) { 315 SearchAction.search(tableModel.getSearchExpression(), Search Action.SearchMode.replace);316 SearchAction.search(tableModel.getSearchExpression(), SearchMode.replace); 316 317 } 317 318 } -
applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceGeometryUtils.java
r32410 r33522 26 26 import org.openstreetmap.josm.command.MoveCommand; 27 27 import org.openstreetmap.josm.data.coor.LatLon; 28 import org.openstreetmap.josm.data.osm.DefaultNameFormatter; 28 29 import org.openstreetmap.josm.data.osm.Node; 29 30 import org.openstreetmap.josm.data.osm.OsmPrimitive; … … 32 33 import org.openstreetmap.josm.data.osm.TagCollection; 33 34 import org.openstreetmap.josm.data.osm.Way; 34 import org.openstreetmap.josm.gui.DefaultNameFormatter;35 35 import org.openstreetmap.josm.gui.Notification; 36 36 import org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog; -
applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceMembershipAction.java
r32410 r33522 19 19 import org.openstreetmap.josm.command.ChangeCommand; 20 20 import org.openstreetmap.josm.command.Command; 21 import org.openstreetmap.josm.data.osm.DefaultNameFormatter; 21 22 import org.openstreetmap.josm.data.osm.OsmPrimitive; 22 23 import org.openstreetmap.josm.data.osm.Relation; 23 24 import org.openstreetmap.josm.data.osm.RelationMember; 24 25 import org.openstreetmap.josm.data.osm.RelationToChildReference; 25 import org.openstreetmap.josm.gui.DefaultNameFormatter;26 26 import org.openstreetmap.josm.gui.Notification; 27 27 import org.openstreetmap.josm.tools.MultiMap; -
applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/ChildrenMatch.java
r32410 r33522 4 4 import static org.openstreetmap.josm.tools.I18n.tr; 5 5 6 import org.openstreetmap.josm.actions.search.PushbackTokenizer;7 import org.openstreetmap.josm.actions.search.SearchCompiler;8 6 import org.openstreetmap.josm.data.osm.OsmPrimitive; 9 7 import org.openstreetmap.josm.data.osm.Relation; 10 8 import org.openstreetmap.josm.data.osm.Way; 9 import org.openstreetmap.josm.data.osm.search.SearchParseError; 10 import org.openstreetmap.josm.data.osm.search.PushbackTokenizer; 11 11 12 12 /** … … 18 18 } 19 19 20 public ChildrenMatch(PushbackTokenizer tokenizer) throws Search Compiler.ParseError {20 public ChildrenMatch(PushbackTokenizer tokenizer) throws SearchParseError { 21 21 this(tokenizer.readRange(tr("Range of child primitives count"))); 22 22 } -
applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/ConnectedMatch.java
r32410 r33522 7 7 8 8 import org.openstreetmap.josm.Main; 9 import org.openstreetmap.josm.actions.search.SearchCompiler;10 9 import org.openstreetmap.josm.data.osm.Node; 11 10 import org.openstreetmap.josm.data.osm.OsmPrimitive; 12 11 import org.openstreetmap.josm.data.osm.Way; 12 import org.openstreetmap.josm.data.osm.search.SearchCompiler; 13 13 import org.openstreetmap.josm.plugins.utilsplugin2.selection.NodeWayUtils; 14 14 -
applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/InsideMatch.java
r32410 r33522 6 6 7 7 import org.openstreetmap.josm.Main; 8 import org.openstreetmap.josm.actions.search.SearchCompiler;9 8 import org.openstreetmap.josm.data.osm.OsmPrimitive; 10 9 import org.openstreetmap.josm.data.osm.Relation; 11 10 import org.openstreetmap.josm.data.osm.Way; 11 import org.openstreetmap.josm.data.osm.search.SearchCompiler; 12 12 import org.openstreetmap.josm.plugins.utilsplugin2.selection.NodeWayUtils; 13 13 -
applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/IntersectingMatch.java
r32410 r33522 7 7 8 8 import org.openstreetmap.josm.Main; 9 import org.openstreetmap.josm.actions.search.SearchCompiler;10 9 import org.openstreetmap.josm.data.osm.OsmPrimitive; 11 10 import org.openstreetmap.josm.data.osm.Way; 11 import org.openstreetmap.josm.data.osm.search.SearchCompiler; 12 12 import org.openstreetmap.josm.plugins.utilsplugin2.selection.NodeWayUtils; 13 13 -
applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/ParentsMatch.java
r32725 r33522 4 4 import static org.openstreetmap.josm.tools.I18n.tr; 5 5 6 import org.openstreetmap.josm.actions.search.PushbackTokenizer;7 import org.openstreetmap.josm.actions.search.SearchCompiler;8 6 import org.openstreetmap.josm.data.osm.OsmPrimitive; 7 import org.openstreetmap.josm.data.osm.search.SearchParseError; 8 import org.openstreetmap.josm.data.osm.search.PushbackTokenizer; 9 9 10 10 /** … … 16 16 } 17 17 18 public ParentsMatch(PushbackTokenizer tokenizer) throws Search Compiler.ParseError {18 public ParentsMatch(PushbackTokenizer tokenizer) throws SearchParseError { 19 19 this(tokenizer.readRange(tr("Range of parent primitives count"))); 20 20 } -
applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/RangeMatch.java
r32410 r33522 2 2 package org.openstreetmap.josm.plugins.utilsplugin2.search; 3 3 4 import org.openstreetmap.josm.actions.search.PushbackTokenizer;5 import org.openstreetmap.josm.actions.search.SearchCompiler;6 4 import org.openstreetmap.josm.data.osm.OsmPrimitive; 5 import org.openstreetmap.josm.data.osm.search.PushbackTokenizer; 6 import org.openstreetmap.josm.data.osm.search.SearchCompiler; 7 7 8 8 /** -
applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/UsedInRelationsMatch.java
r32725 r33522 4 4 import static org.openstreetmap.josm.tools.I18n.tr; 5 5 6 import org.openstreetmap.josm.actions.search.PushbackTokenizer;7 import org.openstreetmap.josm.actions.search.SearchCompiler;8 6 import org.openstreetmap.josm.data.osm.Changeset; 9 7 import org.openstreetmap.josm.data.osm.Node; … … 11 9 import org.openstreetmap.josm.data.osm.Relation; 12 10 import org.openstreetmap.josm.data.osm.Way; 11 import org.openstreetmap.josm.data.osm.search.SearchParseError; 12 import org.openstreetmap.josm.data.osm.search.PushbackTokenizer; 13 13 import org.openstreetmap.josm.data.osm.visitor.Visitor; 14 14 … … 21 21 } 22 22 23 public UsedInRelationsMatch(PushbackTokenizer tokenizer) throws Search Compiler.ParseError {23 public UsedInRelationsMatch(PushbackTokenizer tokenizer) throws SearchParseError { 24 24 this(tokenizer.readRange(tr("Range of referencing relation count"))); 25 25 } -
applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/UsedInWaysMatch.java
r32725 r33522 4 4 import static org.openstreetmap.josm.tools.I18n.tr; 5 5 6 import org.openstreetmap.josm.actions.search.PushbackTokenizer;7 import org.openstreetmap.josm.actions.search.SearchCompiler;8 6 import org.openstreetmap.josm.data.osm.Changeset; 9 7 import org.openstreetmap.josm.data.osm.Node; … … 11 9 import org.openstreetmap.josm.data.osm.Relation; 12 10 import org.openstreetmap.josm.data.osm.Way; 11 import org.openstreetmap.josm.data.osm.search.SearchParseError; 12 import org.openstreetmap.josm.data.osm.search.PushbackTokenizer; 13 13 import org.openstreetmap.josm.data.osm.visitor.Visitor; 14 14 … … 21 21 } 22 22 23 public UsedInWaysMatch(PushbackTokenizer tokenizer) throws Search Compiler.ParseError {23 public UsedInWaysMatch(PushbackTokenizer tokenizer) throws SearchParseError { 24 24 this(tokenizer.readRange(tr("Range of attached ways count"))); 25 25 } -
applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/UtilsSimpleMatchFactory.java
r32410 r33522 5 5 import java.util.Collection; 6 6 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; 7 import org.openstreetmap.josm.data.osm.search.SearchParseError; 8 import org.openstreetmap.josm.data.osm.search.PushbackTokenizer; 9 import org.openstreetmap.josm.data.osm.search.SearchCompiler; 10 import org.openstreetmap.josm.data.osm.search.SearchCompiler.SimpleMatchFactory; 10 11 11 12 public class UtilsSimpleMatchFactory implements SimpleMatchFactory { … … 19 20 20 21 @Override 21 public SearchCompiler.Match get(String keyword, PushbackTokenizer tokenizer) throws Search Compiler.ParseError {22 public SearchCompiler.Match get(String keyword, PushbackTokenizer tokenizer) throws SearchParseError { 22 23 if ("usedinways".equals(keyword)) { 23 24 return new UsedInWaysMatch(tokenizer); -
applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/UtilsUnaryMatchFactory.java
r32410 r33522 5 5 import java.util.Collection; 6 6 7 import org.openstreetmap.josm.actions.search.PushbackTokenizer; 8 import org.openstreetmap.josm.actions.search.SearchCompiler; 7 import org.openstreetmap.josm.data.osm.search.SearchParseError; 8 import org.openstreetmap.josm.data.osm.search.PushbackTokenizer; 9 import org.openstreetmap.josm.data.osm.search.SearchCompiler; 9 10 10 11 public class UtilsUnaryMatchFactory implements SearchCompiler.UnaryMatchFactory { … … 15 16 @Override 16 17 public SearchCompiler.UnaryMatch get(String keyword, SearchCompiler.Match matchOperand, PushbackTokenizer tokenizer) 17 throws Search Compiler.ParseError {18 throws SearchParseError { 18 19 if ("inside".equals(keyword)) { 19 20 return new InsideMatch(matchOperand);
Note:
See TracChangeset
for help on using the changeset viewer.