Changeset 11993 in josm for trunk/src/org/openstreetmap

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)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/DrawAction.java (modified) (1 diff)
• actions/mapmode/MapMode.java (modified) (3 diffs)
• data/osm/FilterMatcher.java (modified) (2 diffs)
• gui/dialogs/FilterDialog.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -1296 +1296 @@
 
     @Override
+    public Collection<? extends OsmPrimitive> getPreservedPrimitives() {
+        DataSet ds = getLayerManager().getEditDataSet();
+        return ds != null ? ds.getSelected() : null;
+    }
+
+    @Override
     public boolean layerIsSupported(Layer l) {
         return l instanceof OsmDataLayer;

trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java

@@ -8 +8 @@
 import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
+import java.util.Collection;
+import java.util.Collections;
 
 import org.openstreetmap.josm.Main;
@@ -13 +15 @@
 import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -201 +204 @@
         readPreferences();
     }
+
+    /**
+     * Gets a collection of primitives that should not be hidden by the filter.
+     * @return The primitives that the filter should not hide.
+     * @since 11993
+     */
+    public Collection<? extends OsmPrimitive> getPreservedPrimitives() {
+        return Collections.emptySet();
+    }
 }

trunk/src/org/openstreetmap/josm/data/osm/FilterMatcher.java

@@ -6 +6 @@
 import java.util.List;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.search.SearchAction.SearchMode;
 import org.openstreetmap.josm.actions.search.SearchCompiler;
@@ -224 +225 @@
     private static FilterType test(List<FilterInfo> filters, OsmPrimitive primitive, boolean hidden) {
 
-        if (primitive.isIncomplete())
+        if (primitive.isIncomplete() || Main.map.mapMode.getPreservedPrimitives().contains(primitive))
             return FilterType.NOT_FILTERED;
 

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