Changeset 11993 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java

Timestamp:

2017-04-24T01:39:24+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #5144 - Cannot draw new ways when filter is active (patch by michael2402)

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java ¶

@@ -29 +29 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.actions.search.SearchAction;
 import org.openstreetmap.josm.data.osm.Filter;
@@ -46 +47 @@
 import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
+import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.MapFrame.MapModeChangeListener;
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -57 +60 @@
  * @author Petr_Dlouhý
  */
-public class FilterDialog extends ToggleDialog implements DataSetListener {
+public class FilterDialog extends ToggleDialog implements DataSetListener, MapModeChangeListener {
 
     private JTable userTable;
@@ -82 +85 @@
     public void showNotify() {
         DatasetEventManager.getInstance().addDatasetListener(this, FireMode.IN_EDT_CONSOLIDATED);
+        MapFrame.addMapModeChangeListener(this);
         filterModel.executeFilters();
     }
@@ -88 +92 @@
     public void hideNotify() {
         DatasetEventManager.getInstance().removeDatasetListener(this);
+        MapFrame.removeMapModeChangeListener(this);
         filterModel.clearFilterFlags();
         Main.map.mapView.repaint();
@@ -108 +113 @@
     };
 
+    /**
+     * Builds the GUI.
+     */
     protected void build() {
         userTable = new UserTable(filterModel);
@@ -375 +383 @@
     }
 
+    @Override
+    public void mapModeChange(MapMode oldMapMode, MapMode newMapMode) {
+        filterModel.executeFilters();
+    }
+
     /**
-     * This method is intendet for Plugins getting the filtermodel and using .addFilter() to
+     * This method is intended for Plugins getting the filtermodel and using .addFilter() to
      * add a new filter.
      * @return the filtermodel