Ignore:
Timestamp:
2017-08-26T00:55:22+02:00 (3 years ago)
Author:
Don-vip
Message:

see #15182 - extract SearchMode and SearchSetting from actions.search.SearchAction to data.osm.search

Location:
trunk/src/org/openstreetmap/josm/data/osm
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/osm/Filter.java

    r11973 r12659  
    44import java.util.Objects;
    55
    6 import org.openstreetmap.josm.actions.search.SearchAction.SearchMode;
    7 import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting;
    86import org.openstreetmap.josm.data.Preferences.pref;
    97import org.openstreetmap.josm.data.Preferences.writeExplicitly;
     8import org.openstreetmap.josm.data.osm.search.SearchMode;
     9import org.openstreetmap.josm.data.osm.search.SearchSetting;
    1010
    1111/**
  • trunk/src/org/openstreetmap/josm/data/osm/FilterMatcher.java

    r12656 r12659  
    66import java.util.List;
    77
    8 import org.openstreetmap.josm.actions.search.SearchAction.SearchMode;
    98import org.openstreetmap.josm.data.osm.search.SearchParseError;
    109import org.openstreetmap.josm.data.osm.search.SearchCompiler;
     10import org.openstreetmap.josm.data.osm.search.SearchMode;
    1111import org.openstreetmap.josm.data.osm.search.SearchCompiler.Match;
    1212import org.openstreetmap.josm.data.osm.search.SearchCompiler.Not;
  • trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java

    r12656 r12659  
    2424
    2525import org.openstreetmap.josm.Main;
    26 import org.openstreetmap.josm.actions.search.SearchAction;
    2726import org.openstreetmap.josm.data.Bounds;
    2827import org.openstreetmap.josm.data.coor.LatLon;
     
    6261 *   fact expression
    6362 *   fact
    64  * 
     63 *
    6564 * fact =
    6665 *  ( expression )
     
    7170 *  term
    7271 *  </pre>
    73  * 
     72 *
    7473 * @author Imi
    7574 * @since 12656 (moved from actions.search package)
     
    16471646     * @see #compile(String)
    16481647     */
    1649     public static Match compile(SearchAction.SearchSetting setting) throws SearchParseError {
     1648    public static Match compile(SearchSetting setting) throws SearchParseError {
    16501649        if (setting.mapCSSSearch) {
    16511650            return compileMapCSS(setting.text);
Note: See TracChangeset for help on using the changeset viewer.