Changeset 10382 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode

Timestamp:

2016-06-15T12:45:52+02:00 (8 years ago)

Author:

Don-vip

Message:

see #12943 - gsoc-core - fix most of deprecation warnings (static accesses must be fixed)

Location:

trunk/src/org/openstreetmap/josm/actions/mapmode

Files:

• DeleteAction.java (modified) (3 diffs)
• DrawAction.java (modified) (17 diffs)
• ExtrudeAction.java (modified) (2 diffs)
• ImproveWayAccuracyAction.java (modified) (7 diffs)
• ParallelWayAction.java (modified) (6 diffs)
• SelectAction.java (modified) (23 diffs)

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

@@ -211 +211 @@
     private void repaintIfRequired(Set<OsmPrimitive> newHighlights, WaySegment newHighlightedWaySegment) {
         boolean needsRepaint = false;
-        DataSet ds = getCurrentDataSet();
+        DataSet ds = getLayerManager().getEditDataSet();
 
         if (newHighlightedWaySegment == null && oldHighlightedWaySegment != null) {
@@ -294 +294 @@
         }
 
-        getCurrentDataSet().setSelected();
+        getLayerManager().getEditDataSet().setSelected();
         giveUserFeedback(e);
     }
@@ -390 +390 @@
     private Command buildDeleteCommands(MouseEvent e, int modifiers, boolean silent) {
         DeleteParameters parameters = getDeleteParameters(e, modifiers);
+        OsmDataLayer editLayer = getLayerManager().getEditLayer();
         switch (parameters.mode) {
         case node:
-            return DeleteCommand.delete(getEditLayer(), Collections.singleton(parameters.nearestNode), false, silent);
+            return DeleteCommand.delete(editLayer, Collections.singleton(parameters.nearestNode), false, silent);
         case node_with_references:
-            return DeleteCommand.deleteWithReferences(getEditLayer(), Collections.singleton(parameters.nearestNode), silent);
+            return DeleteCommand.deleteWithReferences(editLayer, Collections.singleton(parameters.nearestNode), silent);
         case segment:
-            return DeleteCommand.deleteWaySegment(getEditLayer(), parameters.nearestSegment);
+            return DeleteCommand.deleteWaySegment(editLayer, parameters.nearestSegment);
         case way:
-            return DeleteCommand.delete(getEditLayer(), Collections.singleton(parameters.nearestSegment.way), false, silent);
+            return DeleteCommand.delete(editLayer, Collections.singleton(parameters.nearestSegment.way), false, silent);
         case way_with_nodes:
-            return DeleteCommand.delete(getEditLayer(), Collections.singleton(parameters.nearestSegment.way), true, silent);
+            return DeleteCommand.delete(editLayer, Collections.singleton(parameters.nearestSegment.way), true, silent);
         case way_with_references:
-            return DeleteCommand.deleteWithReferences(getEditLayer(), Collections.singleton(parameters.nearestSegment.way), true);
+            return DeleteCommand.deleteWithReferences(editLayer, Collections.singleton(parameters.nearestSegment.way), true);
         default:
             return null;

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

@@ -185 +185 @@
 
         // update selection to reflect which way being modified
-        DataSet currentDataSet = getCurrentDataSet();
+        DataSet currentDataSet = getLayerManager().getEditDataSet();
         if (getCurrentBaseNode() != null && currentDataSet != null && !currentDataSet.getSelected().isEmpty()) {
             Way continueFrom = getWayForNode(getCurrentBaseNode());
@@ -219 +219 @@
         // determine if selection is suitable to continue drawing. If it
         // isn't, set wayIsFinished to true to avoid superfluous repaints.
-        determineCurrentBaseNodeAndPreviousNode(getCurrentDataSet().getSelected());
+        determineCurrentBaseNodeAndPreviousNode(getLayerManager().getEditDataSet().getSelected());
         wayIsFinished = getCurrentBaseNode() == null;
 
@@ -272 +272 @@
         // primitives
         //
-        DataSet ds = getCurrentDataSet();
+        DataSet ds = getLayerManager().getEditDataSet();
         if (ds != null) {
             ds.fireSelectionChanged();
@@ -324 +324 @@
 
     private void tryAgain(MouseEvent e) {
-        getCurrentDataSet().setSelected();
+        getLayerManager().getEditDataSet().setSelected();
         mouseReleased(e);
     }
@@ -394 +394 @@
         mousePos = e.getPoint();
 
-        DataSet ds = getCurrentDataSet();
+        DataSet ds = getLayerManager().getEditDataSet();
         Collection<OsmPrimitive> selection = new ArrayList<>(ds.getSelected());
 
@@ -400 +400 @@
         Node n = Main.map.mapView.getNearestNode(mousePos, OsmPrimitive.isSelectablePredicate);
         if (ctrl) {
-            Iterator<Way> it = getCurrentDataSet().getSelectedWays().iterator();
+            Iterator<Way> it = ds.getSelectedWays().iterator();
             if (it.hasNext()) {
                 // ctrl-click on node of selected way = reuse node despite of ctrl
@@ -416 +416 @@
                 // have to switch modes)
 
-                getCurrentDataSet().setSelected(n);
+                ds.setSelected(n);
                 // If we extend/continue an existing way, select it already now to make it obvious
                 Way continueFrom = getWayForNode(n);
                 if (continueFrom != null) {
-                    getCurrentDataSet().addSelected(continueFrom);
+                    ds.addSelected(continueFrom);
                 }
 
@@ -615 +615 @@
         }
 
-        getCurrentDataSet().setSelected(newSelection);
+        ds.setSelected(newSelection);
 
         // "viewport following" mode for tracing long features
@@ -695 +695 @@
                   (posn0 < selectedWay.getNodesCount()-1) && targetNode.equals(selectedWay.getNode(posn0+1))) {  // next node
                   // CHECKSTYLE.ON: SingleSpaceSeparator
-                getCurrentDataSet().setSelected(targetNode);
+                getLayerManager().getEditDataSet().setSelected(targetNode);
                 lastUsedNode = targetNode;
                 return true;
@@ -779 +779 @@
         }
 
-        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
+        Collection<OsmPrimitive> selection = getLayerManager().getEditDataSet().getSelected();
 
         MapView mv = Main.map.mapView;
@@ -1085 +1085 @@
 
         // This happens when nothing is selected, but we still want to highlight the "target node"
-        if (mouseOnExistingNode == null && getCurrentDataSet().getSelected().isEmpty()
+        if (mouseOnExistingNode == null && getLayerManager().getEditDataSet().getSelected().isEmpty()
                 && mousePos != null) {
             mouseOnExistingNode = Main.map.mapView.getNearestNode(mousePos, OsmPrimitive.isSelectablePredicate);
@@ -1209 +1209 @@
 
         Node n = mouseOnExistingNode;
+        DataSet ds = getLayerManager().getEditDataSet();
         /*
          * Handle special case: Highlighted node == selected node => finish drawing
          */
-        if (n != null && getCurrentDataSet() != null && getCurrentDataSet().getSelectedNodes().contains(n)) {
+        if (n != null && ds != null && ds.getSelectedNodes().contains(n)) {
             if (wayIsFinished) {
                 rv = new StringBuilder(tr("Select node under cursor."));
@@ -1223 +1224 @@
          * Handle special case: Self-Overlapping or closing way
          */
-        if (getCurrentDataSet() != null && !getCurrentDataSet().getSelectedWays().isEmpty() && !wayIsFinished && !alt) {
-            Way w = getCurrentDataSet().getSelectedWays().iterator().next();
+        if (ds != null && !ds.getSelectedWays().isEmpty() && !wayIsFinished && !alt) {
+            Way w = ds.getSelectedWays().iterator().next();
             for (Node m : w.getNodes()) {
                 if (m.equals(mouseOnExistingNode) || mouseOnExistingWays.contains(w)) {
@@ -1246 +1247 @@
      */
     public Collection<OsmPrimitive> getInProgressSelection() {
-        DataSet ds = getCurrentDataSet();
+        DataSet ds = getLayerManager().getEditDataSet();
         if (ds == null) return null;
         if (getCurrentBaseNode() != null && !ds.getSelected().isEmpty()) {
@@ -1263 +1264 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(getEditLayer() != null);
+        setEnabled(getLayerManager().getEditLayer() != null);
     }
 
@@ -1295 +1296 @@
             // select last added node - maybe we will continue drawing from it
             if (n != null) {
-                getCurrentDataSet().addSelected(n);
+                getLayerManager().getEditDataSet().addSelected(n);
             }
         }
@@ -1635 +1636 @@
             projectionSource = null;
             if (snapToProjections) {
-                DataSet ds = getCurrentDataSet();
+                DataSet ds = getLayerManager().getEditDataSet();
                 Collection<Way> selectedWays = ds.getSelectedWays();
                 if (selectedWays.size() == 1) {

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

@@ -427 +427 @@
                 mode = Mode.create_new;
                 // create a new segment and then select and extrude the new segment
-                getCurrentDataSet().setSelected(selectedSegment.way);
+                getLayerManager().getEditDataSet().setSelected(selectedSegment.way);
                 alwaysCreateNodes = true;
             } else {
                 mode = Mode.extrude;
-                getCurrentDataSet().setSelected(selectedSegment.way);
+                getLayerManager().getEditDataSet().setSelected(selectedSegment.way);
                 alwaysCreateNodes = shift;
             }
@@ -611 +611 @@
         Command c = new SequenceCommand(tr("Extrude Way"), cmds);
         Main.main.undoRedo.add(c);
-        getCurrentDataSet().setSelected(wnew);
+        getLayerManager().getEditDataSet().setSelected(wnew);
     }
 

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

@@ -135 +135 @@
         oldModeHelpText = "";
 
-        if (getCurrentDataSet() == null) {
+        if (getLayerManager().getEditDataSet() == null) {
             return;
         }
@@ -211 +211 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(getEditLayer() != null);
+        setEnabled(getLayerManager().getEditLayer() != null);
     }
 
@@ -410 +410 @@
         if (state == State.selecting) {
             if (targetWay != null) {
-                getCurrentDataSet().setSelected(targetWay.getPrimitiveId());
+                getLayerManager().getEditDataSet().setSelected(targetWay.getPrimitiveId());
                 updateStateByCurrentSelection();
             }
@@ -501 +501 @@
                     List<Node> nodeList = new ArrayList<>();
                     nodeList.add(candidateNode);
-                    Command deleteCmd = DeleteCommand.delete(getEditLayer(), nodeList, true);
+                    Command deleteCmd = DeleteCommand.delete(getLayerManager().getEditLayer(), nodeList, true);
                     if (deleteCmd != null) {
                         Main.main.undoRedo.add(deleteCmd);
@@ -513 +513 @@
                 EastNorth cursorEN = mv.getEastNorth(mousePos.x, mousePos.y);
 
-                Main.main.undoRedo.add(new MoveCommand(candidateNode, cursorEN.east() - nodeEN.east(), cursorEN.north()
-                        - nodeEN.north()));
+                Main.main.undoRedo.add(new MoveCommand(candidateNode, cursorEN.east() - nodeEN.east(), cursorEN.north() - nodeEN.north()));
             }
         }
@@ -619 +618 @@
         state = State.improving;
 
-        Collection<OsmPrimitive> currentSelection = getCurrentDataSet().getSelected();
+        DataSet ds = getLayerManager().getEditDataSet();
+        Collection<OsmPrimitive> currentSelection = ds.getSelected();
         if (currentSelection.size() != 1
                 || !currentSelection.iterator().next().equals(targetWay)) {
             selectionChangedBlocked = true;
-            getCurrentDataSet().clearSelection();
-            getCurrentDataSet().setSelected(targetWay.getPrimitiveId());
+            ds.clearSelection();
+            ds.setSelected(targetWay.getPrimitiveId());
             selectionChangedBlocked = false;
         }
@@ -645 +645 @@
         final List<Node> nodeList = new ArrayList<>();
         final List<Way> wayList = new ArrayList<>();
-        final Collection<OsmPrimitive> sel = getCurrentDataSet().getSelected();
+        final Collection<OsmPrimitive> sel = getLayerManager().getEditDataSet().getSelected();
 
         // Collecting nodes and ways from the selection

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

@@ -160 +160 @@
         //// Needed to update the mouse cursor if modifiers are changed when the mouse is motionless
         Main.map.keyDetector.addModifierListener(this);
-        sourceWays = new LinkedHashSet<>(getCurrentDataSet().getSelectedWays());
+        sourceWays = new LinkedHashSet<>(getLayerManager().getEditDataSet().getSelectedWays());
         for (Way w : sourceWays) {
             w.setHighlighted(true);
@@ -302 +302 @@
         // Since the created way is left selected, we need to unselect again here
         if (pWays != null && pWays.getWays() != null) {
-            getCurrentDataSet().clearSelection(pWays.getWays());
+            getLayerManager().getEditDataSet().clearSelection(pWays.getWays());
             pWays = null;
         }
@@ -490 +490 @@
     }
 
-    //// We keep the source ways and the selection in sync so the user can see the source way's tags
+    // We keep the source ways and the selection in sync so the user can see the source way's tags
     private void addSourceWay(Way w) {
         assert sourceWays != null;
-        getCurrentDataSet().addSelected(w);
+        getLayerManager().getEditDataSet().addSelected(w);
         w.setHighlighted(true);
         sourceWays.add(w);
@@ -500 +500 @@
     private void removeSourceWay(Way w) {
         assert sourceWays != null;
-        getCurrentDataSet().clearSelection(w);
+        getLayerManager().getEditDataSet().clearSelection(w);
         w.setHighlighted(false);
         sourceWays.remove(w);
@@ -507 +507 @@
     private void clearSourceWays() {
         assert sourceWays != null;
-        getCurrentDataSet().clearSelection(sourceWays);
+        getLayerManager().getEditDataSet().clearSelection(sourceWays);
         for (Way w : sourceWays) {
             w.setHighlighted(false);
@@ -543 +543 @@
             pWays = new ParallelWays(sourceWays, copyTags, referenceWayIndex);
             pWays.commit();
-            getCurrentDataSet().setSelected(pWays.getWays());
+            getLayerManager().getEditDataSet().setSelected(pWays.getWays());
             return true;
         } catch (IllegalArgumentException e) {

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

@@ -256 +256 @@
         if (mode == Mode.MOVE) {
             if (!dragInProgress() && virtualManager.activateVirtualNodeNearPoint(e.getPoint())) {
-                DataSet ds = getCurrentDataSet();
+                DataSet ds = getLayerManager().getEditDataSet();
                 if (ds != null && drawTargetHighlight) {
                     ds.setHighlightedVirtualNodes(virtualManager.virtualWays);
@@ -306 +306 @@
                 // only consider merge if ctrl is pressed and there are nodes in
                 // the selection that could be merged
-                if (!ctrl || getCurrentDataSet().getSelectedNodes().isEmpty()) {
+                if (!ctrl || getLayerManager().getEditDataSet().getSelectedNodes().isEmpty()) {
                     c = "move";
                     break;
@@ -348 +348 @@
     private boolean removeHighlighting() {
         boolean needsRepaint = false;
-        DataSet ds = getCurrentDataSet();
+        DataSet ds = getLayerManager().getEditDataSet();
         if (ds != null && !ds.getHighlightedVirtualNodes().isEmpty()) {
             needsRepaint = true;
@@ -427 +427 @@
         case SCALE:
             //  if nothing was selected, select primitive under cursor for scaling or rotating
-            if (getCurrentDataSet().getSelected().isEmpty()) {
-                getCurrentDataSet().setSelected(asColl(nearestPrimitive));
+            DataSet ds = getLayerManager().getEditDataSet();
+            if (ds.getSelected().isEmpty()) {
+                ds.setSelected(asColl(nearestPrimitive));
             }
 
@@ -519 +520 @@
             // If ctrl is pressed we are in merge mode. Look for a nearby node,
             // highlight it and adjust the cursor accordingly.
-            final boolean canMerge = ctrl && !getCurrentDataSet().getSelectedNodes().isEmpty();
+            final boolean canMerge = ctrl && !getLayerManager().getEditDataSet().getSelectedNodes().isEmpty();
             final OsmPrimitive p = canMerge ? findNodeToMergeTo(e.getPoint()) : null;
             boolean needsRepaint = removeHighlighting();
@@ -593 +594 @@
 
             // Select Draw Tool if no selection has been made
-            if (getCurrentDataSet().getSelected().isEmpty() && !cancelDrawMode) {
+            if (getLayerManager().getEditDataSet().getSelected().isEmpty() && !cancelDrawMode) {
                 Main.map.selectDrawTool(true);
                 updateStatusLine();
@@ -611 +612 @@
 
                     // If the user double-clicked a node, change to draw mode
-                    Collection<OsmPrimitive> c = getCurrentDataSet().getSelected();
+                    Collection<OsmPrimitive> c = getLayerManager().getEditDataSet().getSelected();
                     if (e.getClickCount() >= 2 && c.size() == 1 && c.iterator().next() instanceof Node) {
                         // We need to do it like this as otherwise drawAction will see a double
@@ -705 +706 @@
         // Currently we support only transformations which do not affect relations.
         // So don't add them in the first place to make handling easier
-        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelectedNodesAndWays();
+        DataSet ds = getLayerManager().getEditDataSet();
+        Collection<OsmPrimitive> selection = ds.getSelectedNodesAndWays();
         if (selection.isEmpty()) { // if nothing was selected to drag, just select nearest node/way to the cursor
             OsmPrimitive nearestPrimitive = mv.getNearestNodeOrWay(mv.getPoint(startEN), mv.isSelectablePredicate, true);
-            getCurrentDataSet().setSelected(nearestPrimitive);
+            ds.setSelected(nearestPrimitive);
         }
 
@@ -719 +721 @@
         if (mode == Mode.MOVE) {
             if (startEN == null) return false; // fix #8128
-            getCurrentDataSet().beginUpdate();
+            ds.beginUpdate();
             if (c instanceof MoveCommand && affectedNodes.equals(((MoveCommand) c).getParticipatingPrimitives())) {
                 ((MoveCommand) c).saveCheckpoint();
@@ -732 +734 @@
                     // Revert move
                     ((MoveCommand) c).resetToCheckpoint();
-                    getCurrentDataSet().endUpdate();
+                    ds.endUpdate();
                     JOptionPane.showMessageDialog(
                             Main.parent,
@@ -749 +751 @@
             }
 
-            getCurrentDataSet().beginUpdate();
+            ds.beginUpdate();
 
             if (mode == Mode.ROTATE) {
@@ -765 +767 @@
             }
 
-            Collection<Way> ways = getCurrentDataSet().getSelectedWays();
+            Collection<Way> ways = ds.getSelectedWays();
             if (doesImpactStatusLine(affectedNodes, ways)) {
                 Main.map.statusLine.setDist(ways);
             }
         }
-        getCurrentDataSet().endUpdate();
+        ds.endUpdate();
         return true;
     }
@@ -790 +792 @@
     private void useLastMoveCommandIfPossible() {
         Command c = getLastCommand();
-        Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(getCurrentDataSet().getSelected());
+        Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(getLayerManager().getEditDataSet().getSelected());
         if (c instanceof MoveCommand && affectedNodes.equals(((MoveCommand) c).getParticipatingPrimitives())) {
             // old command was created with different base point of movement, we need to recalculate it
@@ -829 +831 @@
         }
         int max = Main.pref.getInteger("warn.move.maxelements", 20), limit = max;
-        for (OsmPrimitive osm : getCurrentDataSet().getSelected()) {
+        for (OsmPrimitive osm : getLayerManager().getEditDataSet().getSelected()) {
             if (osm instanceof Way) {
                 limit -= ((Way) osm).getNodes().size();
@@ -855 +857 @@
             if (ctrl) mergePrims(e.getPoint());
         }
-        getCurrentDataSet().fireSelectionChanged();
+        getLayerManager().getEditDataSet().fireSelectionChanged();
     }
 
@@ -890 +892 @@
      */
     private void mergePrims(Point p) {
-        Collection<Node> selNodes = getCurrentDataSet().getSelectedNodes();
+        DataSet ds = getLayerManager().getEditDataSet();
+        Collection<Node> selNodes = ds.getSelectedNodes();
         if (selNodes.isEmpty())
             return;
@@ -900 +903 @@
         if (selNodes.size() == 1) {
             // Move all selected primitive to preserve shape #10748
-            Collection<OsmPrimitive> selection =
-                getCurrentDataSet().getSelectedNodesAndWays();
+            Collection<OsmPrimitive> selection = ds.getSelectedNodesAndWays();
             Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(selection);
             Command c = getLastCommand();
-            getCurrentDataSet().beginUpdate();
+            ds.beginUpdate();
             if (c instanceof MoveCommand
                 && affectedNodes.equals(((MoveCommand) c).getParticipatingPrimitives())) {
@@ -913 +915 @@
                                             targetEN.getY() - selectedEN.getY());
             }
-            getCurrentDataSet().endUpdate();
+            ds.endUpdate();
         }
 
@@ -941 +943 @@
     private Node findNodeToMergeTo(Point p) {
         Collection<Node> target = mv.getNearestNodes(p,
-                getCurrentDataSet().getSelectedNodes(),
+                getLayerManager().getEditDataSet().getSelectedNodes(),
                 mv.isSelectablePredicate);
         return target.isEmpty() ? null : target.iterator().next();
@@ -947 +949 @@
 
     private void selectPrims(Collection<OsmPrimitive> prims, boolean released, boolean area) {
-        DataSet ds = getCurrentDataSet();
+        DataSet ds = getLayerManager().getEditDataSet();
 
         // not allowed together: do not change dataset selection, return early
@@ -996 +998 @@
                 return tr("Release the mouse button to select the objects in the rectangle.");
             else if (mode == Mode.MOVE && (System.currentTimeMillis() - mouseDownTime >= initialMoveDelay)) {
-                final boolean canMerge = getCurrentDataSet() != null && !getCurrentDataSet().getSelectedNodes().isEmpty();
-                final String mergeHelp = canMerge ? ' ' + tr("Ctrl to merge with nearest node.") : "";
+                final DataSet ds = getLayerManager().getEditDataSet();
+                final boolean canMerge = ds != null && !ds.getSelectedNodes().isEmpty();
+                final String mergeHelp = canMerge ? (' ' + tr("Ctrl to merge with nearest node.")) : "";
                 return tr("Release the mouse button to stop moving.") + mergeHelp;
             } else if (mode == Mode.ROTATE)
@@ -1110 +1113 @@
             // updateKeyModifiers() already called before!
 
-            DataSet ds = getCurrentDataSet();
+            DataSet ds = getLayerManager().getEditDataSet();
             OsmPrimitive first = cycleList.iterator().next(), foundInDS = null;
             OsmPrimitive nxt = first;
@@ -1245 +1248 @@
                     virtualWays.size());
             Main.main.undoRedo.add(new SequenceCommand(text, virtualCmds));
-            getCurrentDataSet().setSelected(Collections.singleton((OsmPrimitive) virtualNode));
+            getLayerManager().getEditDataSet().setSelected(Collections.singleton((OsmPrimitive) virtualNode));
             clear();
         }