Changeset 14206 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs
- Timestamp:
- 2018-08-31T00:57:57+02:00 (6 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/dialogs
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java
r14138 r14206 30 30 import org.openstreetmap.josm.data.osm.FilterModel; 31 31 import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent; 32 import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent.DatasetEventType; 32 33 import org.openstreetmap.josm.data.osm.event.DataChangedEvent; 33 34 import org.openstreetmap.josm.data.osm.event.DataSetListener; … … 83 84 DatasetEventManager.getInstance().addDatasetListener(this, FireMode.IN_EDT_CONSOLIDATED); 84 85 MapFrame.addMapModeChangeListener(this); 85 filterModel.executeFilters( );86 filterModel.executeFilters(true); 86 87 } 87 88 … … 326 327 @Override 327 328 public void otherDatasetChange(AbstractDatasetChangedEvent event) { 328 filterModel.executeFilters(); 329 if (!DatasetEventType.FILTERS_CHANGED.equals(event.getType())) { 330 filterModel.executeFilters(); 331 } 329 332 } 330 333 -
trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java
r12630 r14206 63 63 private void updateFilters() { 64 64 AutoFilterManager.getInstance().setCurrentAutoFilter(null); 65 executeFilters( );66 } 67 68 /** 69 * Runs the filters on the current edit data set .65 executeFilters(true); 66 } 67 68 /** 69 * Runs the filters on the current edit data set, if any. Does nothing if no filter is enabled. 70 70 */ 71 71 public void executeFilters() { 72 if (AutoFilterManager.getInstance().getCurrentAutoFilter() == null) { 72 executeFilters(false); 73 } 74 75 /** 76 * Runs the filter on a list of primitives that are part of the edit data set, if any. Does nothing if no filter is enabled. 77 * @param primitives The primitives 78 */ 79 public void executeFilters(Collection<? extends OsmPrimitive> primitives) { 80 executeFilters(primitives, false); 81 } 82 83 /** 84 * Runs the filters on the current edit data set, if any. 85 * @param force force execution of filters even if no filter is enabled. Useful to reset state after change of filters 86 * @since 14206 87 */ 88 public void executeFilters(boolean force) { 89 if (AutoFilterManager.getInstance().getCurrentAutoFilter() == null && (force || model.hasFilters())) { 73 90 model.executeFilters(); 74 91 updateMap(); … … 77 94 78 95 /** 79 * Runs the filter on a list of primitives that are part of the edit data set. 96 * Runs the filter on a list of primitives that are part of the edit data set, if any. 97 * @param force force execution of filters even if no filter is enabled. Useful to reset state after change of filters 80 98 * @param primitives The primitives 81 */ 82 public void executeFilters(Collection<? extends OsmPrimitive> primitives) { 83 if (AutoFilterManager.getInstance().getCurrentAutoFilter() == null) { 99 * @since 14206 100 */ 101 public void executeFilters(Collection<? extends OsmPrimitive> primitives, boolean force) { 102 if (AutoFilterManager.getInstance().getCurrentAutoFilter() == null && (force || model.hasFilters())) { 84 103 model.executeFilters(primitives); 85 104 updateMap();
Note:
See TracChangeset
for help on using the changeset viewer.