Changeset 34817 in osm for applications

Timestamp:

2019-01-12T15:03:13+01:00 (5 years ago)

Author:

gerdp

Message:

fix some FindBugs issues

Location:

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

Files:

• UtilsPlugin2.java (modified) (4 diffs)
• actions/PasteRelationsAction.java (modified) (2 diffs)
• curves/CircleArcMaker.java (modified) (1 diff)
• selection/NodeWayUtils.java (modified) (1 diff)

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/UtilsPlugin2.java

@@ -3 +3 @@
 
 import javax.swing.JMenu;
-import javax.swing.JMenuItem;
 
 import org.openstreetmap.josm.data.osm.search.SearchCompiler;
@@ -55 +54 @@
     private static UtilsPlugin2 instance;
 
-    JMenuItem copyTags;
-
-    JMenuItem unglueRelation;
-    JMenuItem symmetry;
-    JMenuItem addIntersections;
-    JMenuItem splitObject;
-    JMenuItem selectWayNodes;
-    JMenuItem adjNodes;
-    JMenuItem unsNodes;
-    JMenuItem midNodes;
-    JMenuItem adjWays;
-    JMenuItem adjWaysAll;
-    JMenuItem intWays;
-    JMenuItem intWaysR;
-    JMenuItem allInside;
-    JMenuItem undoSelection;
-    JMenuItem extractPoint;
-    JMenuItem wiki;
-    JMenuItem latlon;
-    JMenuItem multiTag;
-
-    JMenuItem replaceGeometry;
-    JMenuItem replaceMembership;
-    JMenuItem tagBuffer;
-    JMenuItem sourceTag;
-    JMenuItem pasteRelations;
-    JMenuItem alignWayNodes;
-    JMenuItem splitOnIntersections;
-    JMenuItem selModifiedNodes;
-    JMenuItem selModifiedWays;
-    JMenuItem selectHighway;
-    JMenuItem selectAreaBoundary;
-
-    JMenuItem selectURL;
-
-    JMenuItem drawArc;
-
     public UtilsPlugin2(PluginInformation info) {
         super(info);
@@ -101 +63 @@
         JMenu selectionMenu = MainApplication.getMenu().selectionMenu;
 
-        copyTags = MainMenu.addAfter(editMenu, new CopyTagsAction(), false, MainApplication.getMenu().copy);
+        MainMenu.addAfter(editMenu, new CopyTagsAction(), false, MainApplication.getMenu().copy);
 
-        addIntersections = MainMenu.add(toolsMenu, new AddIntersectionsAction());
-        splitObject = MainMenu.add(toolsMenu, new SplitObjectAction());
-        alignWayNodes = MainMenu.add(toolsMenu, new AlignWayNodesAction());
-        symmetry = MainMenu.add(toolsMenu, new SymmetryAction());
-        splitOnIntersections = MainMenu.add(toolsMenu, new SplitOnIntersectionsAction());
-        unglueRelation = MainMenu.add(toolsMenu, new UnGlueRelationAction());
+        MainMenu.add(toolsMenu, new AddIntersectionsAction());
+        MainMenu.add(toolsMenu, new SplitObjectAction());
+        MainMenu.add(toolsMenu, new AlignWayNodesAction());
+        MainMenu.add(toolsMenu, new SymmetryAction());
+        MainMenu.add(toolsMenu, new SplitOnIntersectionsAction());
+        MainMenu.add(toolsMenu, new UnGlueRelationAction());
+
         toolsMenu.addSeparator();
-        replaceGeometry = MainMenu.add(toolsMenu, new ReplaceGeometryAction());
-        replaceMembership = MainMenu.add(toolsMenu, new ReplaceMembershipAction());
-        extractPoint = MainMenu.add(toolsMenu, new ExtractPointAction());
-        tagBuffer = MainMenu.add(toolsMenu, new TagBufferAction());
-        sourceTag = MainMenu.add(toolsMenu, new TagSourceAction());
-        pasteRelations = MainMenu.add(toolsMenu, new PasteRelationsAction());
-        wiki = MainMenu.add(dataMenu, new OpenPageAction());
-        latlon = MainMenu.add(toolsMenu, new LatLonAction());
-        drawArc = MainMenu.add(toolsMenu, new CurveAction());
+
+        MainMenu.add(toolsMenu, new ReplaceGeometryAction());
+        MainMenu.add(toolsMenu, new ReplaceMembershipAction());
+        MainMenu.add(toolsMenu, new ExtractPointAction());
+        MainMenu.add(toolsMenu, new TagBufferAction());
+        MainMenu.add(toolsMenu, new TagSourceAction());
+        MainMenu.add(toolsMenu, new PasteRelationsAction());
+        MainMenu.add(dataMenu, new OpenPageAction());
+        MainMenu.add(toolsMenu, new LatLonAction());
+        MainMenu.add(toolsMenu, new CurveAction());
 
         selectionMenu.addSeparator();
 
-        selectWayNodes = MainMenu.add(selectionMenu, new SelectWayNodesAction());
-        adjNodes = MainMenu.add(selectionMenu, new AdjacentNodesAction());
-        unsNodes = MainMenu.add(selectionMenu, new UnselectNodesAction());
-        midNodes = MainMenu.add(selectionMenu, new MiddleNodesAction());
-        adjWays = MainMenu.add(selectionMenu, new AdjacentWaysAction());
-        adjWaysAll = MainMenu.add(selectionMenu, new ConnectedWaysAction());
-        intWays = MainMenu.add(selectionMenu, new IntersectedWaysAction());
-        intWaysR = MainMenu.add(selectionMenu, new IntersectedWaysRecursiveAction());
-        allInside = MainMenu.add(selectionMenu, new SelectAllInsideAction());
-        selModifiedNodes = MainMenu.add(selectionMenu, new SelectModNodesAction());
-        selModifiedWays = MainMenu.add(selectionMenu, new SelectModWaysAction());
-        undoSelection = MainMenu.add(selectionMenu, new UndoSelectionAction());
-        selectHighway = MainMenu.add(selectionMenu, new SelectHighwayAction());
-        selectAreaBoundary = MainMenu.add(selectionMenu, new SelectBoundaryAction());
+        MainMenu.add(selectionMenu, new SelectWayNodesAction());
+        MainMenu.add(selectionMenu, new AdjacentNodesAction());
+        MainMenu.add(selectionMenu, new UnselectNodesAction());
+        MainMenu.add(selectionMenu, new MiddleNodesAction());
+        MainMenu.add(selectionMenu, new AdjacentWaysAction());
+        MainMenu.add(selectionMenu, new ConnectedWaysAction());
+        MainMenu.add(selectionMenu, new IntersectedWaysAction());
+        MainMenu.add(selectionMenu, new IntersectedWaysRecursiveAction());
+        MainMenu.add(selectionMenu, new SelectAllInsideAction());
+        MainMenu.add(selectionMenu, new SelectModNodesAction());
+        MainMenu.add(selectionMenu, new SelectModWaysAction());
+        MainMenu.add(selectionMenu, new UndoSelectionAction());
+        MainMenu.add(selectionMenu, new SelectHighwayAction());
+        MainMenu.add(selectionMenu, new SelectBoundaryAction());
 
-        selectURL = MainMenu.add(dataMenu, new ChooseURLAction());
-        multiTag = MainMenu.add(dataMenu, new MultiTagAction());
+        MainMenu.add(dataMenu, new ChooseURLAction());
+        MainMenu.add(dataMenu, new MultiTagAction());
 
         // register search operators
@@ -147 +111 @@
     @Override
     public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
-        boolean enabled = newFrame != null;
-        enabled = false;
-        unglueRelation.setEnabled(enabled);
-        addIntersections.setEnabled(enabled);
-        splitObject.setEnabled(enabled);
-
-        replaceGeometry.setEnabled(enabled);
-        replaceMembership.setEnabled(enabled);
-        tagBuffer.setEnabled(enabled);
-        sourceTag.setEnabled(enabled);
-        pasteRelations.setEnabled(enabled);
-        alignWayNodes.setEnabled(enabled);
-        splitOnIntersections.setEnabled(enabled);
-        wiki.setEnabled(enabled);
-
-        selectWayNodes.setEnabled(enabled);
-        adjNodes.setEnabled(enabled);
-        unsNodes.setEnabled(enabled);
-        midNodes.setEnabled(enabled);
-        adjWays.setEnabled(enabled);
-        adjWaysAll.setEnabled(enabled);
-        intWays.setEnabled(enabled);
-        intWaysR.setEnabled(enabled);
-        selModifiedNodes.setEnabled(enabled);
-        selModifiedWays.setEnabled(enabled);
-        undoSelection.setEnabled(enabled);
-        selectURL.setEnabled(enabled);
-        allInside.setEnabled(enabled);
-
-        drawArc.setEnabled(enabled);
-        multiTag.setEnabled(enabled);
     }
 

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

@@ -14 +14 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import org.openstreetmap.josm.actions.JosmAction;
@@ -79 +80 @@
 
         List<Command> commands = new ArrayList<>();
-        for (Relation rel : relations.keySet()) {
+        for (Entry<Relation, String> entry : relations.entrySet()) {
+                Relation rel = entry.getKey();
             Relation r = new Relation(rel);
             boolean changed = false;
             for (OsmPrimitive p : selection) {
                 if (!r.getMemberPrimitives().contains(p) && !r.equals(p)) {
-                    String role = relations.get(rel);
+                    String role = entry.getValue();
                     if ("associatedStreet".equals(r.get("type"))) {
                         if (p.get("highway") != null) {

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

@@ -131 +131 @@
         int i = 1;
         for (EastNorth p : slice(points, 1, -2)) {
-            if (i == p2Index.value) {
+            if (p2Index.value != null && i == p2Index.value) {
                 Node n2new = new Node(n2);
                 n2new.setEastNorth(p);

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

@@ -410 +410 @@
         int n = getRayIntersectionsCount(point, polygonPoints);
         if (n < 0) return true; // we are near node or near edge
-        return (n % 2 == 1);
+        return (n % 2 != 0);
     }