Skip to content

Commit

Permalink
Merge pull request #24 from KaartGroup/deprecated_fix
Browse files Browse the repository at this point in the history 
Replace deprecated methods with a non-deprecated method
  • Loading branch information
@don-vip
don-vip authored Apr 9, 2019
2 parents 9fce339 + ff55037 commit 96f47aa
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 18 deletions.
8 changes: 5 additions & 3 deletions src/org/openstreetmap/josm/plugins/auto_tools/actions/MergeBuildingsAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import java.awt.event.KeyEvent;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.Hashtable;
import java.util.LinkedList;
import java.util.List;
Expand All @@ -31,6 +32,7 @@
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.gui.MainApplication;
import org.openstreetmap.josm.tools.Shortcut;
import org.openstreetmap.josm.tools.Utils;

/**
*
Expand Down Expand Up @@ -59,8 +61,8 @@ public void actionPerformed(ActionEvent e) {
LinkedList<OsmPrimitive> sel = new LinkedList<>();

for (OsmPrimitive osm : ways) {
if (OsmPrimitive.getFilteredList(osm.getReferrers(), Relation.class).size() > 0) {
Relation relation = OsmPrimitive.getFilteredList(osm.getReferrers(), Relation.class).get(0);
if (Utils.filteredCollection(osm.getReferrers(), Relation.class).size() > 0) {
Relation relation = new ArrayList<>(Utils.filteredCollection(osm.getReferrers(), Relation.class)).get(0);
Set<String> keys = relation.getKeys().keySet();
for (String key : keys) {
if (!atrributes.containsKey(key)) {
Expand Down Expand Up @@ -137,7 +139,7 @@ public void actionPerformed(ActionEvent e) {

protected Command MergeAllTags(Relation relation, List<OsmPrimitive> selection, TagCollection tc) {
List<OsmPrimitive> selectiontemporal = new ArrayList<>();
Set<Way> selectionways = OsmPrimitive.getFilteredSet((List<OsmPrimitive>) selection, Way.class);
Set<Way> selectionways = new HashSet<>(Utils.filteredCollection((List<OsmPrimitive>) selection, Way.class));
List<Command> commands = new ArrayList<Command>();

if (relation != null) {
Expand Down
7 changes: 4 additions & 3 deletions src/org/openstreetmap/josm/plugins/auto_tools/actions/ReplaceBuilding.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import org.openstreetmap.josm.tools.Pair;
import org.openstreetmap.josm.tools.Shortcut;
import org.openstreetmap.josm.tools.UserCancelException;
import org.openstreetmap.josm.tools.Utils;

import edu.princeton.cs.algs4.AssignmentProblem;

Expand All @@ -68,12 +69,12 @@ public void actionPerformed(ActionEvent e) {
return;
}

if (!OsmPrimitive.getFilteredSet(selection, Node.class).isEmpty()) {
if (!Utils.filteredCollection(selection, Node.class).isEmpty()) {
new Notification(tr("Select only buildings without nodes.")).setIcon(JOptionPane.WARNING_MESSAGE).show();
return;
}

Set<Way> selectedWays = OsmPrimitive.getFilteredSet(selection, Way.class);
Set<Way> selectedWays = new HashSet<>(Utils.filteredCollection(selection, Way.class));
Set<Way> newWays = new HashSet<>();

if (selectedWays.size() == 1) {
Expand Down Expand Up @@ -187,7 +188,7 @@ private static Map<String, String> getAttributes(OsmPrimitive osm, String value)
}

public static ReplaceGeometryCommand buildUpgradeNodeCommand(Node subjectNode, OsmPrimitive referenceObject) {
if (!OsmPrimitive.getFilteredList(subjectNode.getReferrers(), Way.class).isEmpty()) {
if (!Utils.filteredCollection(subjectNode.getReferrers(), Way.class).isEmpty()) {
throw new ReplaceGeometryException(tr("Node belongs to way(s), cannot replace."));
}

Expand Down
24 changes: 12 additions & 12 deletions src/org/openstreetmap/josm/plugins/auto_tools/actions/SplittingTool.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public void keyReleased(KeyEvent e) {

n = MainApplication.getMap().mapView.getNearestNode(mousePos, OsmPrimitive::isSelectable);

if (OsmPrimitive.getFilteredList(newSelection, Node.class).size() == 1 && OsmPrimitive.getFilteredList(newSelection, Way.class).isEmpty()) {
if (Utils.filteredCollection(newSelection, Node.class).size() == 1 && Utils.filteredCollection(newSelection, Way.class).isEmpty()) {
newSelection.clear();
MainApplication.getLayerManager().getEditDataSet().setSelected(newSelection);
}
Expand Down Expand Up @@ -175,7 +175,7 @@ public void keyReleased(KeyEvent e) {
}

//Delete the created node if not in a way
if (OsmPrimitive.getFilteredList(n.getReferrers(), Way.class).isEmpty()) {
if (Utils.filteredCollection(n.getReferrers(), Way.class).isEmpty()) {
MainApplication.getLayerManager().getEditDataSet().removePrimitive(n.getPrimitiveId());

} else {
Expand Down Expand Up @@ -303,9 +303,9 @@ public void SplitRoad(Node node, DataSet ds, Collection<OsmPrimitive> newSelecti

newSelection.add(way);

List<Node> selectedNodes = OsmPrimitive.getFilteredList(newSelection, Node.class);
List<Way> selectedWays = OsmPrimitive.getFilteredList(newSelection, Way.class);
List<Relation> selectedRelations = OsmPrimitive.getFilteredList(newSelection, Relation.class);
List<Node> selectedNodes = new ArrayList<>(Utils.filteredCollection(newSelection, Node.class));
List<Way> selectedWays = new ArrayList<>(Utils.filteredCollection(newSelection, Way.class));
List<Relation> selectedRelations = new ArrayList<>(Utils.filteredCollection(newSelection, Relation.class));

List<Way> applicableWays = getApplicableWays(selectedWays, selectedNodes);

Expand Down Expand Up @@ -349,8 +349,8 @@ public void SplitRoad(Node node, DataSet ds, Collection<OsmPrimitive> newSelecti
Way selectedWay = null;

// Finally, applicableWays contains only one perfect way
if (selectionToSplit != null && selectionToSplit.size() == 1 && applicableWays.contains(OsmPrimitive.getFilteredList(selectionToSplit, Way.class).get(0))) {
selectedWay = OsmPrimitive.getFilteredList(selectionToSplit, Way.class).get(0);
if (selectionToSplit != null && selectionToSplit.size() == 1 && applicableWays.contains(new ArrayList<>(Utils.filteredCollection(selectionToSplit, Way.class)).get(0))) {
selectedWay = new ArrayList<>(Utils.filteredCollection(selectionToSplit, Way.class)).get(0);
} else {
selectedWay = applicableWays.get(0);
}
Expand Down Expand Up @@ -392,7 +392,7 @@ private List<Way> getApplicableWays(List<Way> selectedWays, List<Node> selectedN
// Special case - one of the selected ways touches (not cross) way that we want to split
if (selectedNodes.size() == 1) {
Node n = selectedNodes.get(0);
List<Way> referedWays = OsmPrimitive.getFilteredList(n.getReferrers(), Way.class);
List<Way> referedWays = new ArrayList<>(Utils.filteredCollection(n.getReferrers(), Way.class));
Way inTheMiddle = null;
boolean foundSelected = false;
for (Way w : referedWays) {
Expand All @@ -415,7 +415,7 @@ private List<Way> getApplicableWays(List<Way> selectedWays, List<Node> selectedN
}

// List of ways shared by all nodes
List<Way> result = new ArrayList<Way>(OsmPrimitive.getFilteredList(selectedNodes.get(0).getReferrers(), Way.class));
List<Way> result = new ArrayList<Way>(Utils.filteredCollection(selectedNodes.get(0).getReferrers(), Way.class));
for (int i = 1; i < selectedNodes.size(); i++) {
List<OsmPrimitive> ref = selectedNodes.get(i).getReferrers();
for (Iterator<Way> it = result.iterator(); it.hasNext();) {
Expand Down Expand Up @@ -447,9 +447,9 @@ private List<Way> getApplicableWays(List<Way> selectedWays, List<Node> selectedN

public static void selectTheWay(Way way, Way way2, Node n1, Node n2, Node common) {

int ws1 = OsmPrimitive.getFilteredList(n1.getReferrers(), Way.class).size();
int ws2 = OsmPrimitive.getFilteredList(n2.getReferrers(), Way.class).size();
int wsc = OsmPrimitive.getFilteredList(common.getReferrers(), Way.class).size();
int ws1 = Utils.filteredCollection(n1.getReferrers(), Way.class).size();
int ws2 = Utils.filteredCollection(n2.getReferrers(), Way.class).size();
int wsc = Utils.filteredCollection(common.getReferrers(), Way.class).size();

try {
if ((ws1 > 2 && ws2 > 2) || (ws1 <= 2 && ws2 <= 2)) {
Expand Down

0 comments on commit 96f47aa

Please sign in to comment.