Changeset 19048 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2024-04-19T16:21:11+02:00 (2 years ago)

Author:

taylor.smock

Message:

Dependency updates

ivy.xml

• org.eclipse.parsson:parsson: 1.1.5 -> 1.1.6
• org.apache.commons:commons-compress: 1.25.0 -> 1.26.1
  • Note: This deprecated some functions
• ch.poole:OpeningHoursParser: 0.28.1 -> 0.28.2
• org.jacoco:org.jacoco.ant: 0.8.11 -> 0.8.12
• com.github.spotbugs:spotbugs-annotations: 4.8.3 -> 4.8.4
• com.github.tomakehurst:wiremock: 2.35.0 -> 3.0.1
• io.github.classgraph:classgraph: 4.8.165 -> 4.8.171
• nl.jqno.equalsverifier:equalsverifier: 3.15.6 -> 3.16.1
• org.awaitility:awaitility: 4.2.0 -> 4.2.1

tools/ivy.xml

• com.puppycrawl.tools:checkstyle: 9.3 -> 10.15.0
• com.github.spotbugs:spotbugs: 4.8.3 -> 4.8.4
• com.google.errorprone: 2.(10.0|24.1) -> 2.26.1
• net.sourceforge.pmd:pmd was not updated to 7.0.0 due to a significant number of false positives.

There were some additional changes to cleanup new warnings and remove some
additional Java 8 files. There are more warnings that need to be cleaned up.

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• AddImageryLayerAction.java (modified) (13 diffs)
• AutoScaleAction.java (modified) (10 diffs)
• ChangesetManagerToggleAction.java (modified) (1 diff)
• DownloadOsmInViewAction.java (modified) (1 diff)
• JoinAreasAction.java (modified) (42 diffs)
• SplitWayAction.java (modified) (10 diffs)

trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

@@ -7 +7 @@
 import java.awt.Dimension;
 import java.awt.GraphicsEnvironment;
+import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
@@ -14 +15 @@
 import java.time.Year;
 import java.time.ZoneOffset;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -26 +26 @@
 import javax.swing.JScrollPane;
 
-import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.imagery.DefaultLayer;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
@@ -62 +60 @@
         SelectWmsLayersDialog(WMSLayerTree tree, JComboBox<String> formats) {
             super(MainApplication.getMainFrame(), tr("Select WMS layers"), tr("Add layers"), tr("Cancel"));
-            final JScrollPane scrollPane = new JScrollPane(tree.getLayerTree());
+            final var scrollPane = new JScrollPane(tree.getLayerTree());
             scrollPane.setPreferredSize(new Dimension(400, 400));
-            final JPanel panel = new JPanel(new GridBagLayout());
+            final var panel = new JPanel(new GridBagLayout());
             panel.add(scrollPane, GBC.eol().fill());
-            panel.add(formats, GBC.eol().fill(GBC.HORIZONTAL));
+            panel.add(formats, GBC.eol().fill(GridBagConstraints.HORIZONTAL));
             setContent(panel);
         }
@@ -84 +82 @@
 
         // change toolbar icon from if specified
-        String icon = info.getIcon();
+        var icon = info.getIcon();
         if (icon != null) {
             new ImageProvider(icon).setOptional(true).getResourceAsync(result -> {
@@ -103 +101 @@
         try {
             if (info.getUrl() != null && info.getUrl().contains("{time}")) {
-                final String instant = Year.now(ZoneOffset.UTC).atDay(1).atStartOfDay(ZoneOffset.UTC).toInstant().toString();
-                final String example = String.join("/", instant, instant);
-                final String initialSelectionValue = info.getDate() != null ? info.getDate() : example;
-                final String userDate = JOptionPane.showInputDialog(MainApplication.getMainFrame(),
+                final var instant = Year.now(ZoneOffset.UTC).atDay(1).atStartOfDay(ZoneOffset.UTC).toInstant().toString();
+                final var example = String.join("/", instant, instant);
+                final var initialSelectionValue = info.getDate() != null ? info.getDate() : example;
+                final var userDate = JOptionPane.showInputDialog(MainApplication.getMainFrame(),
                         tr("Time filter for \"{0}\" such as \"{1}\"", info.getName(), example),
                         initialSelectionValue);
@@ -115 +113 @@
                 // TODO persist new {time} value (via ImageryLayerInfo.save?)
             }
-            switch(info.getImageryType()) {
+            switch (info.getImageryType()) {
             case WMS_ENDPOINT:
                 // convert to WMS type
@@ -126 +124 @@
                 // specify which layer to use
                 if (Utils.isEmpty(info.getDefaultLayers())) {
-                    WMTSTileSource tileSource = new WMTSTileSource(info);
-                    DefaultLayer layerId = tileSource.userSelectLayer();
+                    var tileSource = new WMTSTileSource(info);
+                    var layerId = tileSource.userSelectLayer();
                     if (layerId != null) {
-                        ImageryInfo copy = new ImageryInfo(info);
+                        var copy = new ImageryInfo(info);
                         copy.setDefaultLayers(Collections.singletonList(layerId));
-                        String layerName = tileSource.getLayers().stream()
+                        var layerName = tileSource.getLayers().stream()
                                 .filter(x -> x.getIdentifier().equals(layerId.getLayerName()))
                                 .map(Layer::getUserTitle)
@@ -165 +163 @@
         ImageryLayer layer = null;
         try {
-            final ImageryInfo infoToAdd = convertImagery(info);
+            final var infoToAdd = convertImagery(info);
             if (infoToAdd != null) {
                 layer = ImageryLayer.create(infoToAdd);
@@ -207 +205 @@
 
     private static LayerSelection askToSelectLayers(WMSImagery wms) {
-        final WMSLayerTree tree = new WMSLayerTree();
-
-        Collection<String> wmsFormats = wms.getFormats();
-        final JComboBox<String> formats = new JComboBox<>(wmsFormats.toArray(new String[0]));
+        final var tree = new WMSLayerTree();
+
+        var wmsFormats = wms.getFormats();
+        final var formats = new JComboBox<String>(wmsFormats.toArray(new String[0]));
         formats.setSelectedItem(wms.getPreferredFormat());
         formats.setToolTipText(tr("Select image format for WMS layer"));
 
-        JCheckBox checkBounds = new JCheckBox(tr("Show only layers for current view"), true);
+        var checkBounds = new JCheckBox(tr("Show only layers for current view"), true);
         Runnable updateTree = () -> {
-            LatLon latLon = checkBounds.isSelected() && MainApplication.isDisplayingMapView()
+            var latLon = checkBounds.isSelected() && MainApplication.isDisplayingMapView()
                     ? MainApplication.getMap().mapView.getProjection().eastNorth2latlon(MainApplication.getMap().mapView.getCenter())
                     : null;
@@ -227 +225 @@
 
         if (!GraphicsEnvironment.isHeadless()) {
-            ExtendedDialog dialog = new ExtendedDialog(MainApplication.getMainFrame(),
+            var dialog = new ExtendedDialog(MainApplication.getMainFrame(),
                     tr("Select WMS layers"), tr("Add layers"), tr("Cancel"));
-            final JScrollPane scrollPane = new JScrollPane(tree.getLayerTree());
+            final var scrollPane = new JScrollPane(tree.getLayerTree());
             scrollPane.setPreferredSize(new Dimension(400, 400));
-            final JPanel panel = new JPanel(new GridBagLayout());
+            final var panel = new JPanel(new GridBagLayout());
             panel.add(scrollPane, GBC.eol().fill());
-            panel.add(checkBounds, GBC.eol().fill(GBC.HORIZONTAL));
-            panel.add(formats, GBC.eol().fill(GBC.HORIZONTAL));
+            panel.add(checkBounds, GBC.eol().fill(GridBagConstraints.HORIZONTAL));
+            panel.add(formats, GBC.eol().fill(GridBagConstraints.HORIZONTAL));
             dialog.setContent(panel);
 
@@ -283 +281 @@
         CheckParameterUtil.ensureThat(ImageryType.WMS_ENDPOINT == info.getImageryType(), "wms_endpoint imagery type expected");
         // We need to get the URL with {apikey} replaced. See #22642.
-        final TemplatedWMSTileSource tileSource = new TemplatedWMSTileSource(info, ProjectionRegistry.getProjection());
-        final WMSImagery wms = new WMSImagery(tileSource.getBaseUrl(), info.getCustomHttpHeaders());
-        LayerSelection selection = choice.apply(wms);
+        final var tileSource = new TemplatedWMSTileSource(info, ProjectionRegistry.getProjection());
+        final var wms = new WMSImagery(tileSource.getBaseUrl(), info.getCustomHttpHeaders());
+        var selection = choice.apply(wms);
         if (selection == null) {
             return null;
         }
 
-        final String url = wms.buildGetMapUrl(
+        final var url = wms.buildGetMapUrl(
                 selection.layers.stream().map(LayerDetails::getName).collect(Collectors.toList()),
                 (List<String>) null,
@@ -297 +295 @@
                 );
 
-        String selectedLayers = selection.layers.stream()
+        var selectedLayers = selection.layers.stream()
                 .map(LayerDetails::getName)
                 .collect(Collectors.joining(", "));
         // Use full copy of original Imagery info to copy all attributes. Only overwrite what's different
-        ImageryInfo ret = new ImageryInfo(info);
+        var ret = new ImageryInfo(info);
         ret.setUrl(url);
         ret.setImageryType(ImageryType.WMS);

trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java

@@ -8 +8 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
-import java.awt.geom.Area;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -23 +22 @@
 import org.openstreetmap.josm.data.DataSource;
 import org.openstreetmap.josm.data.conflict.Conflict;
-import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.OsmData;
@@ -34 +32 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.NavigatableComponent.ZoomChangeListener;
-import org.openstreetmap.josm.gui.dialogs.ConflictDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.ValidatorDialog.ValidatorBoundingXYVisitor;
@@ -146 +143 @@
      */
     public static void zoomTo(Collection<? extends IPrimitive> sel) {
-        BoundingXYVisitor bboxCalculator = new BoundingXYVisitor();
+        final var bboxCalculator = new BoundingXYVisitor();
         bboxCalculator.computeBoundingBox(sel);
         if (bboxCalculator.getBounds() != null) {
@@ -244 +241 @@
     public void autoScale() {
         if (MainApplication.isDisplayingMapView()) {
-            MapView mapView = MainApplication.getMap().mapView;
+            final var mapView = MainApplication.getMap().mapView;
             switch (mode) {
             case PREVIOUS:
@@ -312 +309 @@
     private void modeLayer(BoundingXYVisitor v) {
         // try to zoom to the first selected layer
-        Layer l = getFirstSelectedLayer();
+        final var l = getFirstSelectedLayer();
         if (l == null)
             return;
@@ -327 +324 @@
             }
         } else {
-            ConflictDialog conflictDialog = MainApplication.getMap().conflictDialog;
+            final var conflictDialog = MainApplication.getMap().conflictDialog;
             Conflict<? extends IPrimitive> c = conflictDialog.getSelectedConflict();
             if (c != null) {
@@ -359 +356 @@
         }
         Bounds bbox = null;
-        final DataSet dataset = getLayerManager().getActiveDataSet();
+        final var dataset = getLayerManager().getActiveDataSet();
         if (dataset != null) {
             List<DataSource> dataSources = new ArrayList<>(dataset.getDataSources());
@@ -372 +369 @@
                 } else {
                     lastZoomArea = -1;
-                    Area sourceArea = getLayerManager().getActiveDataSet().getDataSourceArea();
+                    final var sourceArea = getLayerManager().getActiveDataSet().getDataSourceArea();
                     if (sourceArea != null) {
                         bbox = new Bounds(sourceArea.getBounds2D());
@@ -439 +436 @@
      * Adapter for zoom change events
      */
-    private class ZoomChangeAdapter implements ZoomChangeListener {
+    private final class ZoomChangeAdapter implements ZoomChangeListener {
         @Override
         public void zoomChanged() {

trunk/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java

@@ -49 +49 @@
     }
 
-    private class ChangesetCacheManagerClosedHandler extends WindowAdapter {
+    private final class ChangesetCacheManagerClosedHandler extends WindowAdapter {
         @Override
         public void windowClosed(WindowEvent e) {

trunk/src/org/openstreetmap/josm/actions/DownloadOsmInViewAction.java

@@ -37 +37 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        final Bounds bounds = MainApplication.getMap().mapView.getRealBounds();
-        DownloadOsmInViewTask task = new DownloadOsmInViewTask();
+        final var bounds = MainApplication.getMap().mapView.getRealBounds();
+        final var task = new DownloadOsmInViewTask();
         task.setZoomAfterDownload(false);
         Future<?> future = task.download(bounds);

trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

@@ -210 +210 @@
 
         public List<Node> getNodes() {
-            List<Node> nodes = new ArrayList<>();
+            final var nodes = new ArrayList<Node>();
             for (WayInPolygon way : this.ways) {
                 //do not add the last node as it will be repeated in the next way
                 if (way.insideToTheRight) {
-                    for (int pos = 0; pos < way.way.getNodesCount() - 1; pos++) {
+                    for (var pos = 0; pos < way.way.getNodesCount() - 1; pos++) {
                         nodes.add(way.way.getNode(pos));
                     }
@@ -343 +343 @@
          */
         private static double getAngle(Node n1, Node n2, Node n3) {
-            EastNorth en1 = n1.getEastNorth();
-            EastNorth en2 = n2.getEastNorth();
-            EastNorth en3 = n3.getEastNorth();
+            final var en1 = n1.getEastNorth();
+            final var en2 = n2.getEastNorth();
+            final var en3 = n3.getEastNorth();
             double angle = Math.atan2(en3.getY() - en1.getY(), en3.getX() - en1.getX()) -
                     Math.atan2(en2.getY() - en1.getY(), en2.getX() - en1.getX());
@@ -362 +362 @@
          */
         public WayInPolygon walk() {
-            Node headNode = getHeadNode();
-            Node prevNode = getPrevNode();
+            final var headNode = getHeadNode();
+            final var prevNode = getPrevNode();
 
             double headAngle = Math.atan2(headNode.getEastNorth().east() - prevNode.getEastNorth().east(),
@@ -371 +371 @@
             //find best next way
             WayInPolygon bestWay = null;
-            boolean bestWayReverse = false;
+            var bestWayReverse = false;
 
             for (WayInPolygon way : availableWays) {
@@ -418 +418 @@
          */
         public WayInPolygon leftComingWay() {
-            Node headNode = getHeadNode();
-            Node prevNode = getPrevNode();
+            final var headNode = getHeadNode();
+            final var prevNode = getPrevNode();
 
             WayInPolygon mostLeft = null; // most left way connected to head node
-            boolean comingToHead = false; // true if candidate come to head node
+            var comingToHead = false; // true if candidate come to head node
             double angle = 2*Math.PI;
 
@@ -649 +649 @@
         }
 
-        boolean hasChanges = false;
-
-        List<Way> allStartingWays = new ArrayList<>();
-        List<Way> innerStartingWays = new ArrayList<>();
-        List<Way> outerStartingWays = new ArrayList<>();
+        var hasChanges = false;
+
+        final var allStartingWays = new ArrayList<Way>();
+        final var innerStartingWays = new ArrayList<Way>();
+        final var outerStartingWays = new ArrayList<Way>();
 
         for (Multipolygon area : areas) {
@@ -721 +721 @@
         if (discardedWays.stream().anyMatch(w -> !w.isNew())) {
             for (AssembledPolygon ring : boundaries) {
-                for (int k = 0; k < ring.ways.size(); k++) {
+                for (var k = 0; k < ring.ways.size(); k++) {
                     WayInPolygon ringWay = ring.ways.get(k);
                     Way older = keepOlder(ringWay.way, oldestWayMap, discardedWays);
 
                     if (ringWay.way != older) {
-                        WayInPolygon repl = new WayInPolygon(older, ringWay.insideToTheRight);
+                        final var repl = new WayInPolygon(older, ringWay.insideToTheRight);
                         ring.ways.set(k, repl);
                     }
@@ -769 +769 @@
         // Delete the discarded inner ways
         if (!discardedWays.isEmpty()) {
-            Command deleteCmd = DeleteCommand.delete(discardedWays, true);
+            final var deleteCmd = DeleteCommand.delete(discardedWays, true);
             if (deleteCmd != null) {
                 cmds.add(deleteCmd);
@@ -796 +796 @@
     private Way keepOlder(Way way, Map<Node, Way> oldestWayMap, List<Way> discardedWays) {
         Way oldest = null;
-        for (Node n : way.getNodes()) {
-            Way orig = oldestWayMap .get(n);
+        for (var n : way.getNodes()) {
+            final var orig = oldestWayMap .get(n);
             if (orig != null && (oldest == null || oldest.getUniqueId() > orig.getUniqueId())
                     && discardedWays.contains(orig)) {
@@ -830 +830 @@
         }
 
-        TagCollection wayTags = TagCollection.unionOfAllPrimitives(ways);
+        final var wayTags = TagCollection.unionOfAllPrimitives(ways);
         try {
             cmds.addAll(CombinePrimitiveResolverDialog.launchIfNecessary(wayTags, ways, ways));
@@ -847 +847 @@
      */
     private boolean removeDuplicateNodes(List<Way> ways) {
-        Map<Node, Node> nodeMap = new TreeMap<>(new NodePositionComparator());
-        int totalWaysModified = 0;
+        final var nodeMap = new TreeMap<Node, Node>(new NodePositionComparator());
+        var totalWaysModified = 0;
 
         for (Way way : ways) {
@@ -855 +855 @@
             }
 
-            List<Node> newNodes = new ArrayList<>();
+            final var newNodes = new ArrayList<Node>();
             Node prevNode = null;
-            boolean modifyWay = false;
+            var modifyWay = false;
 
             for (Node node : way.getNodes()) {
-                Node representator = nodeMap.get(node);
+                var representator = nodeMap.get(node);
                 if (representator == null) {
                     //new node
@@ -898 +898 @@
      */
     private void commitCommands(String description) {
-        switch(cmds.size()) {
+        switch (cmds.size()) {
         case 0:
             return;
@@ -923 +923 @@
         cmds.clear();
         if (addUndoRedo && !executedCmds.isEmpty()) {
-            UndoRedoHandler ur = UndoRedoHandler.getInstance();
+            final var ur = UndoRedoHandler.getInstance();
             if (executedCmds.size() == 1) {
                 ur.add(executedCmds.getFirst(), false);
@@ -945 +945 @@
         Map<Way, Way> nextWayMap = new HashMap<>();
 
-        for (int pos = 0; pos < parts.size(); pos++) {
+        for (var pos = 0; pos < parts.size(); pos++) {
 
             if (!parts.get(pos).lastNode().equals(parts.get((pos + 1) % parts.size()).firstNode()))
@@ -956 +956 @@
         Way topWay = null;
         Node topNode = null;
-        int topIndex = 0;
+        var topIndex = 0;
         double minY = Double.POSITIVE_INFINITY;
 
         for (Way way : parts) {
-            for (int pos = 0; pos < way.getNodesCount(); pos++) {
-                Node node = way.getNode(pos);
+            for (var pos = 0; pos < way.getNodesCount(); pos++) {
+                final var node = way.getNode(pos);
 
                 if (node.getEastNorth().getY() < minY) {
@@ -996 +996 @@
             for (Way way : parts) {
                 if (way.firstNode().equals(headNode)) {
-                    Node nextNode = way.getNode(1);
+                    final var nextNode = way.getNode(1);
 
                     if (topWay == null || !Geometry.isToTheRightSideOfLine(prevNode, headNode, bestWayNextNode, nextNode)) {
@@ -1008 +1008 @@
                 if (way.lastNode().equals(headNode)) {
                     //end adjacent to headNode
-                    Node nextNode = way.getNode(way.getNodesCount() - 2);
+                    final var nextNode = way.getNode(way.getNodesCount() - 2);
 
                     if (topWay == null || !Geometry.isToTheRightSideOfLine(prevNode, headNode, bestWayNextNode, nextNode)) {
@@ -1020 +1020 @@
         } else {
             //node is inside way - pick the clockwise going end.
-            Node prev = topWay.getNode(topIndex - 1);
-            Node next = topWay.getNode(topIndex + 1);
+            final var prev = topWay.getNode(topIndex - 1);
+            final var next = topWay.getNode(topIndex + 1);
 
             //there will be no parallel segments in the middle of way, so all fine.
@@ -1027 +1027 @@
         }
 
-        Way curWay = topWay;
+        var curWay = topWay;
         boolean curWayInsideToTheRight = wayClockwise ^ isInner;
         List<WayInPolygon> result = new ArrayList<>();
@@ -1035 +1035 @@
 
             //add cur way
-            WayInPolygon resultWay = new WayInPolygon(curWay, curWayInsideToTheRight);
+            final var resultWay = new WayInPolygon(curWay, curWayInsideToTheRight);
             result.add(resultWay);
 
             //process next way
-            Way nextWay = nextWayMap.get(curWay);
-            Node prevNode = curWay.getNode(curWay.getNodesCount() - 2);
-            Node headNode = curWay.lastNode();
-            Node nextNode = nextWay.getNode(1);
+            final var nextWay = nextWayMap.get(curWay);
+            final var prevNode = curWay.getNode(curWay.getNodesCount() - 2);
+            final var headNode = curWay.lastNode();
+            final var nextNode = nextWay.getNode(1);
 
             if (nextWay == topWay) {
@@ -1068 +1068 @@
             //                       |
 
-            int intersectionCount = 0;
+            var intersectionCount = 0;
 
             for (Way wayA : parts) {
@@ -1078 +1078 @@
                 if (wayA.lastNode().equals(headNode)) {
 
-                    Way wayB = nextWayMap.get(wayA);
+                    final var wayB = nextWayMap.get(wayA);
 
                     //test if wayA is opposite wayB relative to curWay and nextWay
 
-                    Node wayANode = wayA.getNode(wayA.getNodesCount() - 2);
-                    Node wayBNode = wayB.getNode(1);
+                    final var wayANode = wayA.getNode(wayA.getNodesCount() - 2);
+                    final var wayBNode = wayB.getNode(1);
 
                     boolean wayAToTheRight = Geometry.isToTheRightSideOfLine(prevNode, headNode, nextNode, wayANode);
@@ -1117 +1117 @@
      */
     private static void revertDuplicateTwoNodeWays(List<WayInPolygon> parts) {
-        for (int i = 0; i < parts.size(); i++) {
+        for (var i = 0; i < parts.size(); i++) {
             WayInPolygon w1 = parts.get(i);
             if (w1.way.getNodesCount() != 2)
@@ -1141 +1141 @@
     private List<Way> splitWayOnNodes(Way way, Set<Node> nodes, Map<Node, Way> oldestWayMap) {
 
-        List<Way> result = new ArrayList<>();
+        final var result = new ArrayList<Way>();
         List<List<Node>> chunks = buildNodeChunks(way, nodes);
 
         if (chunks.size() > 1) {
-            SplitWayCommand split = SplitWayCommand.splitWay(way, chunks,
+            final var split = SplitWayCommand.splitWay(way, chunks,
                     Collections.emptyList(), SplitWayCommand.Strategy.keepFirstChunk());
 
@@ -1159 +1159 @@
                 if (!way.isNew() && result.size() > 1) {
                     for (Way part : result) {
-                        Node n = part.firstNode();
-                        Way old = oldestWayMap.get(n);
+                        final var n = part.firstNode();
+                        final var old = oldestWayMap.get(n);
                         if (old == null || old.getUniqueId() > way.getUniqueId()) {
                             oldestWayMap.put(n, way);
@@ -1231 +1231 @@
 
         //TODO: bad performance for deep nestings...
-        List<PolygonLevel> result = new ArrayList<>();
+        final var result = new ArrayList<PolygonLevel>();
 
         for (AssembledPolygon outerWay : boundaryWays) {
 
-            boolean outerGood = true;
-            List<AssembledPolygon> innerCandidates = new ArrayList<>();
+            var outerGood = true;
+            final var innerCandidates = new ArrayList<AssembledPolygon>();
 
             for (AssembledPolygon innerWay : boundaryWays) {
@@ -1256 +1256 @@
 
             //add new outer polygon
-            AssembledMultipolygon pol = new AssembledMultipolygon(outerWay);
-            PolygonLevel polLev = new PolygonLevel(pol, level);
+            final var pol = new AssembledMultipolygon(outerWay);
+            final var polLev = new PolygonLevel(pol, level);
 
             //process inner ways
@@ -1288 +1288 @@
         // This seems to appear when is apply over invalid way like #9911 test-case
         // Remove all of these way to make the next work.
-        List<WayInPolygon> cleanMultigonWays = new ArrayList<>();
+        final var cleanMultigonWays = new ArrayList<WayInPolygon>();
         for (WayInPolygon way: multigonWays) {
             if (way.way.getNodesCount() != 2 || !way.way.isClosed())
                 cleanMultigonWays.add(way);
         }
-        WayTraverser traverser = new WayTraverser(cleanMultigonWays);
-        List<AssembledPolygon> result = new ArrayList<>();
+        final var traverser = new WayTraverser(cleanMultigonWays);
+        final var result = new ArrayList<AssembledPolygon>();
 
         WayInPolygon startWay;
         while ((startWay = traverser.startNewWay()) != null) {
-            List<WayInPolygon> path = new ArrayList<>();
-            List<WayInPolygon> startWays = new ArrayList<>();
+            final var path = new ArrayList<WayInPolygon>();
+            final var startWays = new ArrayList<WayInPolygon>();
             path.add(startWay);
             while (true) {
@@ -1318 +1318 @@
                 if (path.get(0) == nextWay) {
                     // path is closed -> stop here
-                    AssembledPolygon ring = new AssembledPolygon(path);
+                    final var ring = new AssembledPolygon(path);
                     if (ring.getNodes().size() <= 2) {
                         // Invalid ring (2 nodes) -> remove
@@ -1357 +1357 @@
      */
     public static List<AssembledPolygon> fixTouchingPolygons(List<AssembledPolygon> polygons) {
-        List<AssembledPolygon> newPolygons = new ArrayList<>();
+        final var newPolygons = new ArrayList<AssembledPolygon>();
 
         for (AssembledPolygon ring : polygons) {
             ring.reverse();
-            WayTraverser traverser = new WayTraverser(ring.ways);
+            final var traverser = new WayTraverser(ring.ways);
             WayInPolygon startWay;
 
             while ((startWay = traverser.startNewWay()) != null) {
-                List<WayInPolygon> simpleRingWays = new ArrayList<>();
+                final var simpleRingWays = new ArrayList<WayInPolygon>();
                 simpleRingWays.add(startWay);
                 WayInPolygon nextWay;
@@ -1374 +1374 @@
                 }
                 traverser.removeWays(simpleRingWays);
-                AssembledPolygon simpleRing = new AssembledPolygon(simpleRingWays);
+                final var simpleRing = new AssembledPolygon(simpleRingWays);
                 simpleRing.reverse();
                 newPolygons.add(simpleRing);
@@ -1411 +1411 @@
      */
     private Multipolygon joinPolygon(AssembledMultipolygon polygon) throws UserCancelException {
-        Multipolygon result = new Multipolygon(joinWays(polygon.outerWay.ways));
+        final var result = new Multipolygon(joinWays(polygon.outerWay.ways));
 
         for (AssembledPolygon pol : polygon.innerWays) {
@@ -1429 +1429 @@
 
         //leave original orientation, if all paths are reverse.
-        boolean allReverse = true;
+        var allReverse = true;
         for (WayInPolygon way : ways) {
             allReverse &= !way.insideToTheRight;
@@ -1440 +1440 @@
         }
 
-        Way joinedWay = joinOrientedWays(ways);
+        final var joinedWay = joinOrientedWays(ways);
 
         //should not happen
@@ -1462 +1462 @@
         // the user about this.
 
-        List<Way> actionWays = new ArrayList<>(ways.size());
-        int oldestPos = 0;
+        final var actionWays = new ArrayList<Way>(ways.size());
+        var oldestPos = 0;
         Way oldest = ways.get(0).way;
         for (WayInPolygon way : ways) {
@@ -1511 +1511 @@
             }
 
-            boolean hasKnownOuter = false;
+            var hasKnownOuter = false;
             outerWays.clear();
             innerWays.clear();
@@ -1538 +1538 @@
             }
 
-            Way outerWay = outerWays.get(0);
+            final var outerWay = outerWays.get(0);
 
             //retain only selected inner ways
@@ -1588 +1588 @@
             processedInnerWays.addAll(innerWays);
 
-            Multipolygon pol = new Multipolygon(outerWay);
+            final var pol = new Multipolygon(outerWay);
             pol.innerWays.addAll(innerWays);
 
@@ -1615 +1615 @@
         OsmDataLayer layer = getLayerManager().getEditLayer();
         // Create new multipolygon relation and add all inner ways to it
-        Relation newRel = new Relation();
+        final var newRel = new Relation();
         newRel.put("type", "multipolygon");
         for (Way w : inner) {
@@ -1650 +1650 @@
 
                 cmds.add(new ChangeMembersCommand(r, members));
-                RelationRole saverel = new RelationRole(r, rm.getRole());
+                final var saverel = new RelationRole(r, rm.getRole());
                 if (!result.contains(saverel)) {
                     result.add(saverel);
@@ -1701 +1701 @@
         default:
             // Create a new relation with all previous members and (Way)outer as outer.
-            Relation newRel = new Relation();
+            final var newRel = new Relation();
             for (RelationRole r : multiouters) {
                 // Add members

trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

@@ -7 +7 @@
 
 import java.awt.Component;
+import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
@@ -146 +147 @@
 
         // Finally, applicableWays contains only one perfect way
-        final Way selectedWay = applicableWays.get(0);
-        final List<OsmPrimitive> sel = new ArrayList<>(ds.getSelectedRelations());
+        final var selectedWay = applicableWays.get(0);
+        final var sel = new ArrayList<OsmPrimitive>(ds.getSelectedRelations());
         sel.addAll(selectedWays);
         doSplitWayShowSegmentSelection(selectedWay, selectedNodes, sel);
@@ -164 +165 @@
         if (wayChunks != null) {
             final List<Way> newWays = SplitWayCommand.createNewWaysFromChunks(splitWay, wayChunks);
-            final Way wayToKeep = SplitWayCommand.Strategy.keepLongestChunk().determineWayToKeep(newWays);
+            final var wayToKeep = SplitWayCommand.Strategy.keepLongestChunk().determineWayToKeep(newWays);
 
             if (ExpertToggleAction.isExpert() && !splitWay.isNew()) {
@@ -210 +211 @@
 
             setButtonIcons("ok", "cancel");
-            final JPanel pane = new JPanel(new GridBagLayout());
-            pane.add(new JLabel(getTitle()), GBC.eol().fill(GBC.HORIZONTAL));
-            pane.add(list, GBC.eop().fill(GBC.HORIZONTAL));
+            final var pane = new JPanel(new GridBagLayout());
+            pane.add(new JLabel(getTitle()), GBC.eol().fill(GridBagConstraints.HORIZONTAL));
+            pane.add(list, GBC.eop().fill(GridBagConstraints.HORIZONTAL));
             setContent(pane);
             setDefaultCloseOperation(HIDE_ON_CLOSE);
@@ -224 +225 @@
                     final Collection<WaySegment> segments = new ArrayList<>(selected.getNodesCount() - 1);
                     final Iterator<Node> it = selected.getNodes().iterator();
-                    Node previousNode = it.next();
+                    var previousNode = it.next();
                     while (it.hasNext()) {
-                        final Node node = it.next();
+                        final var node = it.next();
                         segments.add(WaySegment.forNodePair(selectedWay, previousNode, node));
                         previousNode = node;
@@ -237 +238 @@
 
         protected void setHighlightedWaySegments(Collection<WaySegment> segments) {
-            DataSet ds = selectedWay.getDataSet();
+            final var ds = selectedWay.getDataSet();
             if (ds != null) {
                 ds.setHighlightedWaySegments(segments);
@@ -247 +248 @@
         public void setVisible(boolean visible) {
             super.setVisible(visible);
-            DataSet ds = selectedWay.getDataSet();
+            final var ds = selectedWay.getDataSet();
             if (visible) {
                 DISPLAY_COUNT.incrementAndGet();
@@ -276 +277 @@
         }
 
-        private class SplitWayDataSetListener implements DataSetListener {
+        private final class SplitWayDataSetListener implements DataSetListener {
 
             @Override
@@ -336 +337 @@
         @Override
         public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
-            final Component c = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+            final var c = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
             final String name = DefaultNameFormatter.getInstance().format((Way) value);
             // get rid of id from DefaultNameFormatter.decorateNameWithId()
@@ -359 +360 @@
         // 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);
+            final var n = selectedNodes.get(0);
             List<Way> referredWays = n.getParentWays();
             Way inTheMiddle = null;