Changeset 12656 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java

Timestamp:

2017-08-26T00:40:19+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - move SearchCompiler from actions.search to data.osm.search

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java

@@ -34 +34 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.AdaptableAction;
-import org.openstreetmap.josm.actions.search.SearchCompiler;
-import org.openstreetmap.josm.actions.search.SearchCompiler.Match;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
 import org.openstreetmap.josm.command.Command;
@@ -44 +42 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.data.osm.search.SearchCompiler;
+import org.openstreetmap.josm.data.osm.search.SearchCompiler.Match;
+import org.openstreetmap.josm.data.osm.search.SearchParseError;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -246 +247 @@
         try {
             this.nameTemplateFilter = SearchCompiler.compile(filter);
-        } catch (SearchCompiler.ParseError e) {
+        } catch (SearchParseError e) {
             Logging.error("Error while parsing" + filter + ": " + e.getMessage());
             throw new SAXException(e);