Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 13308) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 13309) @@ -199,7 +199,8 @@ /** * Checks if a map redraw is required and does so if needed. Also updates the status bar. + * @param e event, can be null * @return true if a repaint is needed */ - private boolean redrawIfRequired() { + private boolean redrawIfRequired(Object e) { updateStatusLine(); // repaint required if the helper line is active. @@ -236,7 +237,12 @@ needsRepaint = true; } else if (!alt && continueFrom != null && !continueFrom.isSelected()) { - currentDataSet.addSelected(continueFrom); + addSelection(currentDataSet, continueFrom); needsRepaint = true; } + } + + if (!needsRepaint && e instanceof SelectionChangeEvent) { + SelectionChangeEvent event = (SelectionChangeEvent) e; + needsRepaint = !event.getOldSelection().isEmpty() && event.getSelection().isEmpty(); } @@ -250,9 +256,39 @@ ds.beginUpdate(); // to prevent the selection listener to screw around with the state try { - ds.addSelected(toAdd); - ds.clearSelection(toRemove); + addSelection(ds, toAdd); + clearSelection(ds, toRemove); } finally { ds.endUpdate(); } + } + + private static void updatePreservedFlag(OsmPrimitive osm, boolean state) { + // Preserves selected primitives and selected way nodes + osm.setPreserved(state); + if (osm instanceof Way) { + for (Node n : ((Way) osm).getNodes()) { + n.setPreserved(state); + } + } + } + + private static void setSelection(DataSet ds, Collection toSet) { + toSet.stream().forEach(x -> updatePreservedFlag(x, true)); + ds.setSelected(toSet); + } + + private static void setSelection(DataSet ds, OsmPrimitive toSet) { + updatePreservedFlag(toSet, true); + ds.setSelected(toSet); + } + + private static void addSelection(DataSet ds, OsmPrimitive toAdd) { + updatePreservedFlag(toAdd, true); + ds.addSelected(toAdd); + } + + private static void clearSelection(DataSet ds, OsmPrimitive toRemove) { + ds.clearSelection(toRemove); + updatePreservedFlag(toRemove, false); } @@ -303,5 +339,10 @@ map.statusLine.activateAnglePanel(false); - removeHighlighting(); + DataSet ds = getLayerManager().getEditDataSet(); + if (ds != null) { + ds.getSelected().stream().forEach(x -> updatePreservedFlag(x, false)); + } + + removeHighlighting(null); map.keyDetector.removeKeyListener(this); map.keyDetector.removeModifierExListener(this); @@ -317,5 +358,5 @@ updateKeyModifiersEx(modifiers); computeHelperLine(); - addHighlighting(); + addHighlighting(null); } @@ -326,5 +367,5 @@ snapHelper.setFixedMode(); computeHelperLine(); - redrawIfRequired(); + redrawIfRequired(e); } @@ -339,5 +380,5 @@ snapHelper.unFixOrTurnOff(); computeHelperLine(); - redrawIfRequired(); + redrawIfRequired(e); } @@ -351,11 +392,13 @@ // Make sure helper line is computed later (causes deadlock in selection event chain otherwise) SwingUtilities.invokeLater(() -> { + event.getOldSelection().stream().forEach(x -> updatePreservedFlag(x, false)); + event.getSelection().stream().forEach(x -> updatePreservedFlag(x, true)); computeHelperLine(); - addHighlighting(); + addHighlighting(event); }); } private void tryAgain(MouseEvent e) { - getLayerManager().getEditDataSet().setSelected(); + getLayerManager().getEditDataSet().clearSelection(); mouseReleased(e); } @@ -374,5 +417,5 @@ // Redraw to remove the helper line stub computeHelperLine(); - removeHighlighting(); + removeHighlighting(null); } @@ -445,9 +488,9 @@ // have to switch modes) - ds.setSelected(n); + setSelection(ds, n); // If we extend/continue an existing way, select it already now to make it obvious Way continueFrom = getWayForNode(n); if (continueFrom != null) { - ds.addSelected(continueFrom); + addSelection(ds, continueFrom); } @@ -627,5 +670,5 @@ } - ds.setSelected(newSelection); + setSelection(ds, newSelection); // "viewport following" mode for tracing long features @@ -635,5 +678,5 @@ } computeHelperLine(); - removeHighlighting(); + removeHighlighting(e); } @@ -730,5 +773,5 @@ (posn0 >= 1 && targetNode.equals(selectedWay.getNode(posn0-1)))) || // previous node (posn0 < selectedWay.getNodesCount()-1 && targetNode.equals(selectedWay.getNode(posn0+1)))) { // next node - getLayerManager().getEditDataSet().setSelected(targetNode); + setSelection(getLayerManager().getEditDataSet(), targetNode); lastUsedNode = targetNode; return true; @@ -789,5 +832,5 @@ computeHelperLine(); - addHighlighting(); + addHighlighting(e); } @@ -961,5 +1004,5 @@ mousePos = e.getPoint(); snapHelper.noSnapNow(); - boolean repaintIssued = removeHighlighting(); + boolean repaintIssued = removeHighlighting(e); // force repaint in case snapHelper needs one. If removeHighlighting // caused one already, don't do it again. @@ -1123,6 +1166,7 @@ * bar both addHighlighting() and repaintIfRequired() are needed, since former fills newHighlights * and latter processes them into oldHighlights. - */ - private void addHighlighting() { + * @param event event, can be null + */ + private void addHighlighting(Object event) { newHighlights = new HashSet<>(); MapView mapView = MainApplication.getMap().mapView; @@ -1131,5 +1175,5 @@ if (ctrl) { mapView.setNewCursor(cursor, this); - redrawIfRequired(); + redrawIfRequired(event); return; } @@ -1143,5 +1187,5 @@ mapView.setNewCursor(cursorJoinNode, this); newHighlights.add(mouseOnExistingNode); - redrawIfRequired(); + redrawIfRequired(event); return; } @@ -1150,5 +1194,5 @@ if (mouseOnExistingWays.isEmpty()) { mapView.setNewCursor(cursor, this); - redrawIfRequired(); + redrawIfRequired(event); return; } @@ -1156,14 +1200,15 @@ mapView.setNewCursor(cursorJoinWay, this); newHighlights.addAll(mouseOnExistingWays); - redrawIfRequired(); + redrawIfRequired(event); } /** * Removes target highlighting from primitives. Issues repaint if required. + * @param event event, can be null * @return true if a repaint has been issued. */ - private boolean removeHighlighting() { + private boolean removeHighlighting(Object event) { newHighlights = new HashSet<>(); - return redrawIfRequired(); + return redrawIfRequired(event); } @@ -1314,14 +1359,5 @@ public Collection getPreservedPrimitives() { DataSet ds = getLayerManager().getEditDataSet(); - if (ds != null) { - // Preserves selected primitives and selected way nodes - Set result = new HashSet<>(); - for (Way w : ds.getSelectedWays()) { - result.addAll(w.getNodes()); - } - result.addAll(ds.getSelected()); - return result; - } - return Collections.emptySet(); + return ds != null ? ds.allPreservedPrimitives() : Collections.emptySet(); } @@ -1368,5 +1404,5 @@ // select last added node - maybe we will continue drawing from it if (n != null) { - getLayerManager().getEditDataSet().addSelected(n); + addSelection(getLayerManager().getEditDataSet(), n); } } Index: trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java (revision 13308) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java (revision 13309) @@ -233,6 +233,8 @@ * Gets a collection of primitives that should not be hidden by the filter. * @return The primitives that the filter should not hide. + * @deprecated use {@link org.openstreetmap.josm.data.osm.DataSet#allPreservedPrimitives} * @since 11993 */ + @Deprecated public Collection getPreservedPrimitives() { return Collections.emptySet(); Index: trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (revision 13308) +++ trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (revision 13309) @@ -169,4 +169,9 @@ */ protected static final short FLAG_ANNOTATED = 1 << 12; + + /** + * Determines if the primitive is preserved from the filter mechanism. + */ + protected static final short FLAG_PRESERVED = 1 << 13; /** Index: trunk/src/org/openstreetmap/josm/data/osm/DataSet.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (revision 13308) +++ trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (revision 13309) @@ -518,4 +518,14 @@ /** + * Returns a collection containing all primitives preserved from filtering. + * @return A collection containing all primitives preserved from filtering. + * @see OsmPrimitive#isPreserved + * @since 13309 + */ + public Collection allPreservedPrimitives() { + return getPrimitives(OsmPrimitive::isPreserved); + } + + /** * Adds a primitive to the dataset. * Index: trunk/src/org/openstreetmap/josm/data/osm/FilterMatcher.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/FilterMatcher.java (revision 13308) +++ trunk/src/org/openstreetmap/josm/data/osm/FilterMatcher.java (revision 13309) @@ -11,6 +11,4 @@ import org.openstreetmap.josm.data.osm.search.SearchMode; import org.openstreetmap.josm.data.osm.search.SearchParseError; -import org.openstreetmap.josm.gui.MainApplication; -import org.openstreetmap.josm.gui.MapFrame; import org.openstreetmap.josm.tools.SubclassFilteredCollection; @@ -225,7 +223,5 @@ private static FilterType test(List filters, OsmPrimitive primitive, boolean hidden) { - MapFrame map = MainApplication.getMap(); - if (primitive.isIncomplete() || - (map != null && map.mapMode != null && map.mapMode.getPreservedPrimitives().contains(primitive))) + if (primitive.isIncomplete() || primitive.isPreserved()) return FilterType.NOT_FILTERED; Index: trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 13308) +++ trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 13309) @@ -428,4 +428,13 @@ /** + * Set binary property used internally by the filter mechanism. + * @param isPreserved new "preserved" flag value + * @since 13309 + */ + public void setPreserved(boolean isPreserved) { + updateFlags(FLAG_PRESERVED, isPreserved); + } + + /** * Replies true, if this primitive is disabled. (E.g. a filter applies) * @return {@code true} if this object has the "disabled" flag enabled @@ -457,4 +466,13 @@ public boolean getDisabledType() { return (flags & FLAG_DISABLED_TYPE) != 0; + } + + /** + * Replies true, if this primitive is preserved from filtering. + * @return {@code true} if this object has the "preserved" flag enabled + * @since 13309 + */ + public boolean isPreserved() { + return (flags & FLAG_PRESERVED) != 0; }