Changeset 32725 in osm for applications/editors/josm/plugins/utilsplugin2/src/org

Timestamp:

2016-07-27T03:10:06+02:00 (8 years ago)

Author:

donvip

Message:

update to JOSM 10658

Location:

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2

Files:

• actions/CopyTagsAction.java (modified) (3 diffs)
• actions/PasteRelationsAction.java (modified) (4 diffs)
• actions/TagBufferAction.java (modified) (4 diffs)
• command/ChangeRelationMemberCommand.java (modified) (2 diffs)
• curves/CircleArcMaker.java (modified) (2 diffs)
• customurl/URLList.java (modified) (2 diffs)
• latlon/LatLonAction.java (modified) (1 diff)
• search/ParentsMatch.java (modified) (1 diff)
• search/UsedInRelationsMatch.java (modified) (2 diffs)
• search/UsedInWaysMatch.java (modified) (2 diffs)
• selection/NodeWayUtils.java (modified) (6 diffs)

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/CopyTagsAction.java

@@ -18 +18 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -62 +63 @@
             }
         }
-        if (!values.isEmpty()) Utils.copyToClipboard(Utils.join("\n", values));
+        if (!values.isEmpty())
+            ClipboardUtils.copyString(Utils.join("\n", values));
     }
 
@@ -83 +85 @@
                     tr("Information"),
                     JOptionPane.INFORMATION_MESSAGE
-            );
+                    );
             return true;
         }

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/PasteRelationsAction.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.datatransfer.UnsupportedFlavorException;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -21 +24 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
+import org.openstreetmap.josm.gui.datatransfer.data.PrimitiveTransferData;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -44 +49 @@
 
         Map<Relation, String> relations = new HashMap<>();
-        for (PrimitiveData pdata : Main.pasteBuffer.getDirectlyAdded()) {
+        Collection<PrimitiveData> data = Collections.emptySet();
+        try {
+            data = ((PrimitiveTransferData) ClipboardUtils.getClipboard().getData(PrimitiveTransferData.DATA_FLAVOR)).getDirectlyAdded();
+        } catch (UnsupportedFlavorException | IOException ex) {
+            Main.warn(ex);
+        }
+        for (PrimitiveData pdata : data) {
             OsmPrimitive p = getLayerManager().getEditDataSet().getPrimitiveById(pdata.getUniqueId(), pdata.getType());
             if (p != null) {
@@ -98 +109 @@
     @Override
     protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
-        setEnabled(selection != null && !selection.isEmpty() && !Main.pasteBuffer.isEmpty());
+        setEnabled(selection != null && !selection.isEmpty()
+                && ClipboardUtils.getClipboard().isDataFlavorAvailable(PrimitiveTransferData.DATA_FLAVOR));
     }
 }

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/TagBufferAction.java

@@ -13 +13 @@
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Predicate;
 
 import org.openstreetmap.josm.Main;
@@ -20 +21 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.tools.Predicate;
 import org.openstreetmap.josm.tools.Shortcut;
-import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 
 /**
@@ -31 +31 @@
 public class TagBufferAction extends JosmAction {
     private static final String TITLE = tr("Copy tags from previous selection");
-    private static final Predicate<OsmPrimitive> IS_TAGGED_PREDICATE = new Predicate<OsmPrimitive>() {
-        @Override
-        public boolean evaluate(OsmPrimitive object) {
-            return object.isTagged();
-        }
-    };
+    private static final Predicate<OsmPrimitive> IS_TAGGED_PREDICATE = object -> object.isTagged();
     private Map<String, String> tags = new HashMap<>();
     private Map<String, String> currentTags = new HashMap<>();
@@ -117 +112 @@
     private void rememberSelectionTags() {
         // Fix #8350 - only care about tagged objects
-        final Collection<OsmPrimitive> selectedTaggedObjects = Utils.filter(
+        final Collection<OsmPrimitive> selectedTaggedObjects = SubclassFilteredCollection.filter(
                 getLayerManager().getEditDataSet().getSelected(), IS_TAGGED_PREDICATE);
         if (!selectedTaggedObjects.isEmpty()) {

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/command/ChangeRelationMemberCommand.java

@@ -6 +6 @@
 import java.util.Collection;
 import java.util.LinkedList;
+import java.util.Objects;
 
 import org.openstreetmap.josm.command.Command;
@@ -36 +37 @@
         LinkedList<RelationMember> newrms = new LinkedList<>();
         for (RelationMember rm : relation.getMembers()) {
-            if (rm.getMember() == oldP) {
+            if (Objects.equals(rm.getMember(), oldP)) {
                 newrms.add(new RelationMember(rm.getRole(), newP));
             } else {

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/curves/CircleArcMaker.java

@@ -11 +11 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
@@ -178 +179 @@
                     // We look for the first anchor node. The next should be directly to the left or right.
                     // Exception when the way is closed
-                    if (n == anchorNodes[a]) {
+                    if (Objects.equals(n, anchorNodes[a])) {
                         bi = i;
                         Node otherAnchor = anchorNodes[a + 1];
-                        if (i > 0 && tw.getNode(i - 1) == otherAnchor) {
+                        if (i > 0 && Objects.equals(tw.getNode(i - 1), otherAnchor)) {
                             ei = i - 1;
-                        } else if (i < (tw.getNodesCount() - 1) && tw.getNode(i + 1) == otherAnchor) {
+                        } else if (i < (tw.getNodesCount() - 1) && Objects.equals(tw.getNode(i + 1), otherAnchor)) {
                             ei = i + 1;
                         } else {

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/customurl/URLList.java

@@ -4 +4 @@
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.List;
@@ -70 +71 @@
     public static List<String> loadURLList() {
         ArrayList<String> items = new ArrayList<>();
-        BufferedReader fr = null;
-        try {
-            File f = new File(UtilsPlugin2.getInstance().getPluginDir(), "customurl.txt");
-            fr = new BufferedReader(new FileReader(f));
+        File f = new File(UtilsPlugin2.getInstance().getPluginDir(), "customurl.txt");
+        try (BufferedReader fr = Files.newBufferedReader(f.toPath(), StandardCharsets.UTF_8)) {
             String s;
-            while ((s = fr.readLine()) != null) items.add(s);
+            while ((s = fr.readLine()) != null) {
+                items.add(s);
+            }
         } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                if (fr != null)
-                    fr.close();
-            } catch (Exception e) {
-                Main.warn(e);
-            }
+            Main.error(e);
         }
         return items;

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/latlon/LatLonAction.java

@@ -68 +68 @@
         }
 
-        if (type == "nodes") {
+        if ("nodes".equals(type)) {
             //we dont need to do anything, we already have all the nodes
-        }
-        if (type == "way") {
+        } else if ("way".equals(type)) {
             Way wnew = new Way();
             wnew.setNodes(nodes);
             cmds.add(new AddCommand(wnew));
-        }
-        if (type == "area") {
+        } else if ("area".equals(type)) {
             nodes.add(nodes.get(0)); // this is needed to close the way.
             Way wnew = new Way();

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/ParentsMatch.java

@@ -22 +22 @@
     @Override
     protected Long getNumber(OsmPrimitive osm) {
-        return new Long(osm.getReferrers().size());
+        return Long.valueOf(osm.getReferrers().size());
     }
 

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/UsedInRelationsMatch.java

@@ -25 +25 @@
     }
 
-    private class RelationCounter implements Visitor {
+    private static class RelationCounter implements Visitor {
         int count;
         @Override
@@ -54 +54 @@
         counter.count = 0;
         osm.visitReferrers(counter);
-        return new Long(counter.count);
+        return Long.valueOf(counter.count);
     }
 

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/UsedInWaysMatch.java

@@ -25 +25 @@
     }
 
-    private class WayCounter implements Visitor {
+    private static class WayCounter implements Visitor {
         int count;
         @Override
@@ -54 +54 @@
             counter.count = 0;
             osm.visitReferrers(counter);
-            return new Long(counter.count);
+            return Long.valueOf(counter.count);
         } else return null;
     }

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/NodeWayUtils.java

@@ -9 +9 @@
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
@@ -107 +108 @@
         int count = 0;
         for (Way anyway: ways) {
-            if (anyway == w) continue;
+            if (Objects.equals(anyway, w)) continue;
             if (newWays.contains(anyway) || excludeWays.contains(anyway)) continue;
 
@@ -130 +131 @@
         int count = 0;
         for (Way anyway: ways) {
-            if (anyway == w) continue;
+            if (Objects.equals(anyway, w)) continue;
             if (newWays.contains(anyway)) continue;
             List<Pair<Node, Node>> nodePairs2 = anyway.getNodePairs(false);
@@ -291 +292 @@
 
             for (OsmPrimitive ref : curNode.getReferrers()) {
-                if (ref instanceof Way && ref != w && ref.isSelectable()) {
+                if (ref instanceof Way && !Objects.equals(ref, w) && ref.isSelectable()) {
                     //
                     Way w2 = (Way) ref;
@@ -298 +299 @@
                     if (w2.getNodesCount() < 2 || w2.isClosed()) continue;
 
-                    if (curNode == w2.firstNode()) {
+                    if (Objects.equals(curNode, w2.firstNode())) {
                         nextNode = w2.getNode(1);
                         preLast = w2.getNode(w2.getNodesCount()-2);
                         endNode = w2.lastNode(); // forward direction
-                    } else if (curNode == w2.lastNode()) {
+                    } else if (Objects.equals(curNode, w2.lastNode())) {
                         nextNode = w2.getNode(w2.getNodesCount()-2);
                         preLast = w2.getNode(1);
@@ -321 +322 @@
                 }
             }
-            if (firstWay == nextWay) {
+            if (Objects.equals(firstWay, nextWay)) {
                 //we came to starting way, but not not the right end
-                if (otherEnd == firstWay.firstNode()) return false;
+                if (Objects.equals(otherEnd, firstWay.firstNode())) return false;
                 newWays.addAll(newestWays);
                 return true; // correct loop found