Changeset 12659 in josm for trunk/src/org/openstreetmap/josm/gui
- Timestamp:
- 2017-08-26T00:55:22+02:00 (4 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/MainApplication.java
r12647 r12659 73 73 import org.openstreetmap.josm.data.osm.DataSet; 74 74 import org.openstreetmap.josm.data.osm.OsmPrimitive; 75 import org.openstreetmap.josm.data.osm.search.SearchMode; 75 76 import org.openstreetmap.josm.data.validation.OsmValidator; 76 77 import org.openstreetmap.josm.gui.ProgramArguments.Option; … … 1024 1025 tasks.add(MainApplication.worker.submit(() -> { 1025 1026 for (String s : selectionArguments) { 1026 SearchAction.search(s, Search Action.SearchMode.add);1027 SearchAction.search(s, SearchMode.add); 1027 1028 } 1028 1029 })); -
trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
r12636 r12659 44 44 import org.openstreetmap.josm.actions.relation.EditRelationAction; 45 45 import org.openstreetmap.josm.actions.relation.SelectInRelationListAction; 46 import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting;47 46 import org.openstreetmap.josm.data.SelectionChangedListener; 48 47 import org.openstreetmap.josm.data.coor.LatLon; … … 58 57 import org.openstreetmap.josm.data.osm.event.DatasetEventManager; 59 58 import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode; 59 import org.openstreetmap.josm.data.osm.search.SearchSetting; 60 60 import org.openstreetmap.josm.data.osm.event.NodeMovedEvent; 61 61 import org.openstreetmap.josm.data.osm.event.PrimitivesAddedEvent; -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
r12656 r12659 60 60 import org.openstreetmap.josm.actions.relation.SelectMembersAction; 61 61 import org.openstreetmap.josm.actions.relation.SelectRelationAction; 62 import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting;63 62 import org.openstreetmap.josm.command.ChangeCommand; 64 63 import org.openstreetmap.josm.command.ChangePropertyCommand; … … 78 77 import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode; 79 78 import org.openstreetmap.josm.data.osm.search.SearchCompiler; 79 import org.openstreetmap.josm.data.osm.search.SearchSetting; 80 80 import org.openstreetmap.josm.data.osm.event.SelectionEventManager; 81 81 import org.openstreetmap.josm.data.preferences.StringProperty; -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/RecentTagCollection.java
r12656 r12659 8 8 import java.util.Map; 9 9 10 import org.openstreetmap.josm.actions.search.SearchAction;11 10 import org.openstreetmap.josm.data.osm.Tag; 12 11 import org.openstreetmap.josm.data.osm.search.SearchParseError; 12 import org.openstreetmap.josm.data.osm.search.SearchSetting; 13 13 import org.openstreetmap.josm.data.osm.search.SearchCompiler; 14 14 import org.openstreetmap.josm.data.preferences.CollectionProperty; … … 82 82 } 83 83 84 public void setTagsToIgnore(Search Action.SearchSetting tagsToIgnore) throws SearchParseError {84 public void setTagsToIgnore(SearchSetting tagsToIgnore) throws SearchParseError { 85 85 setTagsToIgnore(tagsToIgnore.text.isEmpty() ? SearchCompiler.Never.INSTANCE : SearchCompiler.compile(tagsToIgnore)); 86 86 } 87 87 88 public Search Action.SearchSetting ignoreTag(Tag tagToIgnore, SearchAction.SearchSetting settingToUpdate) throws SearchParseError {88 public SearchSetting ignoreTag(Tag tagToIgnore, SearchSetting settingToUpdate) throws SearchParseError { 89 89 final String forTag = SearchCompiler.buildSearchStringForTag(tagToIgnore.getKey(), tagToIgnore.getValue()); 90 90 settingToUpdate.text = settingToUpdate.text.isEmpty() -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
r12656 r12659 70 70 import org.openstreetmap.josm.data.osm.Tag; 71 71 import org.openstreetmap.josm.data.osm.search.SearchParseError; 72 import org.openstreetmap.josm.data.osm.search.SearchSetting; 72 73 import org.openstreetmap.josm.data.osm.search.SearchCompiler; 73 74 import org.openstreetmap.josm.data.preferences.BooleanProperty; … … 130 131 Collections.<String>emptyList()); 131 132 public static final StringProperty PROPERTY_TAGS_TO_IGNORE = new StringProperty("properties.recent-tags.ignore", 132 new Search Action.SearchSetting().writeToString());133 new SearchSetting().writeToString()); 133 134 134 135 /** … … 163 164 164 165 final RecentTagCollection recentTags = new RecentTagCollection(MAX_LRU_TAGS_NUMBER); 165 Search Action.SearchSetting tagsToIgnore;166 SearchSetting tagsToIgnore; 166 167 167 168 /** … … 330 331 331 332 void loadTagsToIgnore() { 332 final Search Action.SearchSetting searchSetting = Utils.firstNonNull(333 Search Action.SearchSetting.readFromString(PROPERTY_TAGS_TO_IGNORE.get()), new SearchAction.SearchSetting());333 final SearchSetting searchSetting = Utils.firstNonNull( 334 SearchSetting.readFromString(PROPERTY_TAGS_TO_IGNORE.get()), new SearchSetting()); 334 335 if (!Objects.equals(tagsToIgnore, searchSetting)) { 335 336 try { … … 338 339 } catch (SearchParseError parseError) { 339 340 warnAboutParseError(parseError); 340 tagsToIgnore = new Search Action.SearchSetting();341 tagsToIgnore = new SearchSetting(); 341 342 recentTags.setTagsToIgnore(SearchCompiler.Never.INSTANCE); 342 343 } … … 1024 1025 @Override 1025 1026 public void actionPerformed(ActionEvent e) { 1026 final Search Action.SearchSetting newTagsToIngore = SearchAction.showSearchDialog(tagsToIgnore);1027 final SearchSetting newTagsToIngore = SearchAction.showSearchDialog(tagsToIgnore); 1027 1028 if (newTagsToIngore == null) { 1028 1029 return; -
trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Roles.java
r12656 r12659 13 13 import javax.swing.JPanel; 14 14 15 import org.openstreetmap.josm.actions.search.SearchAction;16 15 import org.openstreetmap.josm.data.osm.OsmPrimitive; 17 16 import org.openstreetmap.josm.data.osm.Tag; 18 17 import org.openstreetmap.josm.data.osm.search.SearchParseError; 18 import org.openstreetmap.josm.data.osm.search.SearchSetting; 19 19 import org.openstreetmap.josm.data.osm.search.SearchCompiler; 20 20 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItem; … … 78 78 public void setMember_expression(String memberExpression) throws SAXException { 79 79 try { 80 final Search Action.SearchSetting searchSetting = new SearchAction.SearchSetting();80 final SearchSetting searchSetting = new SearchSetting(); 81 81 searchSetting.text = memberExpression; 82 82 searchSetting.caseSensitive = true;
Note: See TracChangeset
for help on using the changeset viewer.