- Timestamp:
- 2020-02-05T22:09:38+01:00 (5 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/autofilter
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilter.java
r12474 r15817 3 3 4 4 import java.util.Objects; 5 6 import org.openstreetmap.josm.data.osm.Filter;7 5 8 6 /** … … 13 11 private final String label; 14 12 private final String description; 15 private final Filter filter;13 private final AutoFilterManager.CompiledFilter filter; 16 14 17 15 /** … … 21 19 * @param filter associated filter 22 20 */ 23 public AutoFilter(String label, String description, Filter filter) {21 public AutoFilter(String label, String description, AutoFilterManager.CompiledFilter filter) { 24 22 this.label = label; 25 23 this.description = description; … … 47 45 * @return the filter 48 46 */ 49 public Filter getFilter() {47 public AutoFilterManager.CompiledFilter getFilter() { 50 48 return filter; 51 49 } -
trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java
r15764 r15817 149 149 // Make sure current auto filter button remains visible even if no data is found, to allow user to disable it 150 150 if (currentAutoFilter != null) { 151 values.add(currentAutoFilter.getFilter(). text.split("=")[1]);151 values.add(currentAutoFilter.getFilter().value); 152 152 } 153 153 if (!values.equals(buttons.keySet())) { … … 186 186 MapView mapView = MainApplication.getMap().mapView; 187 187 for (final String value : values.descendingSet()) { 188 Filter filter = new CompiledFilter(enabledRule.getKey(), value);188 CompiledFilter filter = new CompiledFilter(enabledRule.getKey(), value); 189 189 String label = enabledRule.getValueFormatter().apply(value); 190 190 AutoFilter autoFilter = new AutoFilter(label, filter.text, filter);
Note:
See TracChangeset
for help on using the changeset viewer.