Changeset 19048 in josm for trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

Timestamp:

2024-04-19T16:21:11+02:00 (6 weeks 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.

File:

• trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified) (10 diffs)

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;