Ticket #22832: josm_22832_minor_fixes.patch

src/org/openstreetmap/josm/actions/corrector/ReverseWayTagCorrector.java

@@ -98 +98 @@
                 String leftRight = m.group(2).toLowerCase(Locale.ENGLISH);
 
                 StringBuilder result = new StringBuilder();
-                result.append(text.substring(0, m.start(2)))
+                result.append(text, 0, m.start(2))
                       .append(leftRight.equals(a) ? b : a)
                       .append(text.substring(m.end(2)));
 

src/org/openstreetmap/josm/actions/ShowStatusReportAction.java

@@ -141 +141 @@
             }
         }
         text.format("Locale info: %s%n", Locale.getDefault().toString());
-        text.format("Numbers with default locale: %s -> %d%n", Integer.toString(1_234_567_890), 1_234_567_890);
+        text.format("Numbers with default locale: %s -> %d%n", 1_234_567_890, 1_234_567_890);
 
         if (PlatformManager.isPlatformUnixoid()) {
             PlatformHookUnixoid platform = (PlatformHookUnixoid) PlatformManager.getPlatform();

src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java

@@ -156 +156 @@
         // Remove broken ways
         result.removeIf(way -> way.getNodesCount() <= 2);
 
-        if (selectedWays.isEmpty())
-            return result;
-        else {
-            // Return only selected ways
+        // Remove selected ways
+        if (!selectedWays.isEmpty()) {
             result.removeIf(way -> !selectedWays.contains(way));
-            return result;
-        }
+        }
+        return result;
     }
 
     @Override

src/org/openstreetmap/josm/command/AddPrimitivesCommand.java

@@ -102 +102 @@
                 if (preExistingData.stream().anyMatch(pd -> pd.getPrimitiveId().equals(osm.getPrimitiveId()))) {
                     Optional<PrimitiveData> o = data.stream()
                             .filter(pd -> pd.getPrimitiveId().equals(osm.getPrimitiveId())).findAny();
-                    if (o.isPresent()) {
-                        osm.load(o.get());
-                    }
+                    o.ifPresent(osm::load);
                 } else {
                     ds.addPrimitive(osm);
                 }

src/org/openstreetmap/josm/data/cache/JCSCacheManager.java

@@ -110 +110 @@
 
         try {
             if (!cacheDir.exists() && !cacheDir.mkdirs()) {
-                Logging.warn("Cache directory " + cacheDir.toString() + " does not exists and could not create it");
+                Logging.warn("Cache directory " + cacheDir + " does not exists and could not create it");
             } else {
                 File cacheDirLockPath = new File(cacheDir, ".lock");
                 try {

src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Layers.java

@@ -478 +478 @@
         } else {
             zoomSelector = EMPTY_STRING;
         }
-        final String commonData = zoomSelector + this.filter.toString() + "::" + this.id + "{" + this.paintProperties + "}";
+        final String commonData = zoomSelector + this.filter + "::" + this.id + "{" + this.paintProperties + "}";
 
         if (this.type == Type.CIRCLE || this.type == Type.SYMBOL) {
             return "node" + commonData;

src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java

@@ -618 +618 @@
             }
         }
         if (nameTag == null) {
-            sb.append(Long.toString(relation.getId())).append(", ");
+            sb.append(relation.getId()).append(", ");
         } else {
             sb.append('\"').append(nameTag).append("\", ");
         }

src/org/openstreetmap/josm/data/osm/Node.java

@@ -202 +202 @@
     void setDataset(DataSet dataSet) {
         super.setDataset(dataSet);
         if (!isIncomplete() && isVisible() && !isLatLonKnown())
-            throw new DataIntegrityProblemException("Complete node with null coordinates: " + toString());
+            throw new DataIntegrityProblemException("Complete node with null coordinates: " + this);
     }
 
     @Override

src/org/openstreetmap/josm/data/osm/OsmDataManager.java

@@ -70 +70 @@
     public void setActiveDataSet(DataSet ds) {
         Optional<OsmDataLayer> layer = MainApplication.getLayerManager().getLayersOfType(OsmDataLayer.class).stream()
                 .filter(l -> l.data.equals(ds)).findFirst();
-        if (layer.isPresent()) {
-            MainApplication.getLayerManager().setActiveLayer(layer.get());
-        }
+        layer.ifPresent(osmDataLayer -> MainApplication.getLayerManager().setActiveLayer(osmDataLayer));
     }
 
     @Override

src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -195 +195 @@
      */
     public void checkDataset() {
         if (dataSet == null)
-            throw new DataIntegrityProblemException("Primitive must be part of the dataset: " + toString());
+            throw new DataIntegrityProblemException("Primitive must be part of the dataset: " + this);
     }
 
     /**
@@ -203 +203 @@
      */
     protected final void checkDatasetNotReadOnly() {
         if (dataSet != null && dataSet.isLocked())
-            throw new DataIntegrityProblemException("Primitive cannot be modified in read-only dataset: " + toString());
+            throw new DataIntegrityProblemException("Primitive cannot be modified in read-only dataset: " + this);
     }
 
     protected boolean writeLock() {
@@ -991 +991 @@
     }
 
     /**
-     * Equal, if the id (and class) is equal.
-     *
-     * An primitive is equal to its incomplete counter part.
+     * Equal if the id (and class) are equal.
+     * <p>
+     * A primitive is equal to its incomplete counterpart.
      */
     @Override
     public boolean equals(Object obj) {
@@ -1009 +1009 @@
 
     /**
      * Return the id plus the class type encoded as hashcode or super's hashcode if id is 0.
-     *
-     * An primitive has the same hashcode as its incomplete counterpart.
+     * <p>
+     * A primitive has the same hashcode as its incomplete counterpart.
      */
     @Override
     public int hashCode() {

src/org/openstreetmap/josm/data/osm/Relation.java

@@ -443 +443 @@
         }
 
         BBox box = new BBox();
-        addToBBox(box, new HashSet<PrimitiveId>());
+        addToBBox(box, new HashSet<>());
         if (getDataSet() == null) {
             return box;
         }
@@ -493 +493 @@
             if (Config.getPref().getBoolean("debug.checkDeleteReferenced", true)) {
                 for (RelationMember rm: members) {
                     if (rm.getMember().isDeleted())
-                        throw new DataIntegrityProblemException("Deleted member referenced: " + toString(), null, this, rm.getMember());
+                        throw new DataIntegrityProblemException("Deleted member referenced: " + this, null, this, rm.getMember());
                 }
             }
         }
@@ -524 +524 @@
     @Override
     public Collection<OsmPrimitive> getIncompleteMembers() {
         return Arrays.stream(members)
-                .filter(rm -> rm.getMember().isIncomplete())
                 .map(RelationMember::getMember)
+                .filter(AbstractPrimitive::isIncomplete)
                 .collect(Collectors.toSet());
     }
 

src/org/openstreetmap/josm/data/osm/Way.java

@@ -551 +551 @@
                     throw new DataIntegrityProblemException("Nodes in way must be in the same dataset",
                             tr("Nodes in way must be in the same dataset"));
                 if (n.isDeleted())
-                    throw new DataIntegrityProblemException("Deleted node referenced: " + toString(),
+                    throw new DataIntegrityProblemException("Deleted node referenced: " + this,
                             "<html>" + tr("Deleted node referenced by {0}",
                                     DefaultNameFormatter.getInstance().formatAsHtmlUnorderedList(this)) + "</html>",
                             this, n);
@@ -559 +559 @@
             if (Config.getPref().getBoolean("debug.checkNullCoor", true)) {
                 for (Node n: nodes) {
                     if (n.isVisible() && !n.isIncomplete() && !n.isLatLonKnown())
-                        throw new DataIntegrityProblemException("Complete visible node with null coordinates: " + toString(),
+                        throw new DataIntegrityProblemException("Complete visible node with null coordinates: " + this,
                                 "<html>" + tr("Complete node {0} with null coordinates in way {1}",
                                         DefaultNameFormatter.getInstance().formatAsHtmlUnorderedList(n),
                                         DefaultNameFormatter.getInstance().formatAsHtmlUnorderedList(this)) + "</html>",

src/org/openstreetmap/josm/data/projection/ProjectionCLI.java

@@ -154 +154 @@
             EastNorth enOut = toProj.latlon2eastNorth(ll);
             double cOut1 = argSwitchOutput ? enOut.north() : enOut.east();
             double cOut2 = argSwitchOutput ? enOut.east() : enOut.north();
-            System.out.println(Double.toString(cOut1) + " " + Double.toString(cOut2));
+            System.out.println(cOut1 + " " + cOut2);
             System.out.flush();
         }
     }

src/org/openstreetmap/josm/data/validation/tests/Lanes.java

@@ -63 +63 @@
                             .primitives(p)
                             .build());
                 }
-            } catch (NumberFormatException ignore) {
-                Logging.debug(ignore.getMessage());
+            } catch (NumberFormatException e) {
+                Logging.debug(e.getMessage());
             }
         }
     }
@@ -75 +75 @@
         final String forward = Utils.firstNonNull(p.get("lanes:forward"), "0");
         final String backward = Utils.firstNonNull(p.get("lanes:backward"), "0");
         try {
-        if (Integer.parseInt(lanes) < Integer.parseInt(forward) + Integer.parseInt(backward)) {
-            errors.add(TestError.builder(this, Severity.WARNING, 3101)
-                    .message(tr("Number of {0} greater than {1}", tr("{0}+{1}", "lanes:forward", "lanes:backward"), "lanes"))
-                    .primitives(p)
-                    .build());
-        }
-        } catch (NumberFormatException ignore) {
-            Logging.debug(ignore.getMessage());
+            if (Integer.parseInt(lanes) < Integer.parseInt(forward) + Integer.parseInt(backward)) {
+                errors.add(TestError.builder(this, Severity.WARNING, 3101)
+                        .message(tr("Number of {0} greater than {1}", tr("{0}+{1}", "lanes:forward", "lanes:backward"), "lanes"))
+                        .primitives(p)
+                        .build());
+            }
+        } catch (NumberFormatException e) {
+            Logging.debug(e.getMessage());
         }
     }
 

src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

@@ -444 +444 @@
                 cnt++;
                 // add frequently changing info to progress monitor so that it
                 // doesn't seem to hang when test takes longer than 0.5 seconds
-                if (cnt % 10000 == 0 && stopwatch.elapsed() >= 500) {
+                if (cnt % 10_000 == 0 && stopwatch.elapsed() >= 500) {
                     progressMonitor.setExtraText(tr(" {0}: {1} of {2} elements done", title, cnt, selection.size()));
                 }
             }
@@ -487 +487 @@
                     addIfNotSimilar(e, errors);
             }
         }
-
     }
-
 }

src/org/openstreetmap/josm/data/validation/ValidationTask.java

@@ -36 +36 @@
      *
      * @param tests                     the tests to run
      * @param validatedPrimitives       the collection of primitives to validate.
-     * @param formerValidatedPrimitives the last collection of primitives being validates. May be null.
+     * @param formerValidatedPrimitives the last collection of primitives being validated. May be null.
      */
     public ValidationTask(Collection<Test> tests,
                           Collection<OsmPrimitive> validatedPrimitives,
@@ -48 +48 @@
                              Collection<Test> tests,
                              Collection<OsmPrimitive> validatedPrimitives,
                              Collection<OsmPrimitive> formerValidatedPrimitives) {
-        super(tr("Validating"), progressMonitor, false /*don't ignore exceptions */);
+        super(tr("Validating"), progressMonitor, false);
         this.validatedPrimitives = validatedPrimitives;
         this.formerValidatedPrimitives = formerValidatedPrimitives;
         this.tests = tests;

src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java

@@ -216 +216 @@
          */
         protected void renderValue(Object value) {
             setFont(UIManager.getFont("ComboBox.font"));
-            if (String.class.isInstance(value)) {
-                setText(String.class.cast(value));
-            } else if (MultiValueDecisionType.class.isInstance(value)) {
-                switch(MultiValueDecisionType.class.cast(value)) {
+            if (value instanceof String) {
+                setText((String) value);
+            } else if (value instanceof MultiValueDecisionType) {
+                switch((MultiValueDecisionType) value) {
                 case UNDECIDED:
                     setText(tr("Choose a value"));
                     setFont(UIManager.getFont("ComboBox.font").deriveFont(Font.ITALIC + Font.BOLD));

src/org/openstreetmap/josm/gui/correction/CorrectionTable.java

@@ -38 +38 @@
         super(correctionTableModel);
 
         final int correctionsSize = correctionTableModel.getCorrections().size();
-        final int lines = correctionsSize > MAX_VISIBLE_LINES ? MAX_VISIBLE_LINES : correctionsSize;
+        final int lines = Math.min(correctionsSize, MAX_VISIBLE_LINES);
         setPreferredScrollableViewportSize(new Dimension(400, lines * getRowHeight()));
         getColumnModel().getColumn(correctionTableModel.getApplyColumn()).setPreferredWidth(40);
         setRowSelectionAllowed(false);

src/org/openstreetmap/josm/gui/dialogs/changeset/query/UidInputFieldValidator.java

@@ -65 +65 @@
         if (Utils.isBlank(value)) return 0;
         try {
             int uid = Integer.parseInt(value.trim());
-            if (uid > 0)
-                return uid;
-            return 0;
+            return Math.max(uid, 0);
         } catch (NumberFormatException e) {
             return 0;
         }

src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetsInActiveDataLayerListModel.java

@@ -81 +81 @@
         // just init the model content. Don't register as DataSetListener. The mode
         // is already registered to receive DataChangedEvents from the current edit layer
         DataSet ds = e.getSource().getActiveDataSet();
-        if (ds != null) {
-            initFromDataSet(ds);
-        } else {
-            initFromDataSet(null);
-        }
+        initFromDataSet(ds);
     }
 }

src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java

@@ -26 +26 @@
 import org.openstreetmap.josm.actions.AutoScaleAction.AutoScaleMode;
 import org.openstreetmap.josm.actions.HistoryInfoAction;
 import org.openstreetmap.josm.actions.ZoomToAction;
+import org.openstreetmap.josm.data.osm.AbstractPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
@@ -130 +131 @@
         if (MainApplication.isDisplayingMapView()) {
             Collection<RelationMember> sel = getMemberTableModel().getSelectedMembers();
             final Set<OsmPrimitive> toHighlight = sel.stream()
-                    .filter(r -> r.getMember().isUsable())
                     .map(RelationMember::getMember)
+                    .filter(AbstractPrimitive::isUsable)
                     .collect(Collectors.toSet());
             SwingUtilities.invokeLater(() -> {
                 if (MainApplication.isDisplayingMapView() && highlightHelper.highlightOnly(toHighlight)) {

src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

@@ -551 +551 @@
     public Set<OsmPrimitive> getChildPrimitives(Collection<? extends OsmPrimitive> referenceSet) {
         if (referenceSet == null) return null;
         return members.stream()
-                .filter(m -> referenceSet.contains(m.getMember()))
                 .map(RelationMember::getMember)
+                .filter(referenceSet::contains)
                 .collect(Collectors.toSet());
     }
 

src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java

@@ -128 +128 @@
                 Set<String> tests = new HashSet<>();
                 visitTestErrors(node, err -> tests.add(getTesterDetails(err)), null);
                 String source = (tests.size() == 1) ? tr("Test: {0}", tests.iterator().next()) : tr("Different tests");
-                res = node.toString() + "<br>" + source;
+                res = node + "<br>" + source;
             }
         }
         return res == null ? null : "<html>" + res + "</html>";

src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java

@@ -192 +192 @@
         tfLatLon.setText(CoordinateFormatManager.getDefaultFormat().latToString(llc) + ' ' +
                          CoordinateFormatManager.getDefaultFormat().lonToString(llc));
         EastNorth en = ProjectionRegistry.getProjection().latlon2eastNorth(llc);
-        tfEastNorth.setText(Double.toString(en.east()) + ' ' + Double.toString(en.north()));
+        tfEastNorth.setText(Double.toString(en.east()) + ' ' + en.north());
         // Both latLonCoordinates and eastNorthCoordinates may have been reset to null if ll is out of the world
         latLonCoordinates = llc;
         eastNorthCoordinates = en;

src/org/openstreetmap/josm/gui/download/BookmarkSelection.java

@@ -143 +143 @@
         gc.fill = GridBagConstraints.BOTH;
         gc.weightx = 1.0;
         gc.weighty = 1.0;
-        gc.gridx = 1;
         dlg.add(new JScrollPane(bookmarks), gc);
 
         this.parent = gui;

src/org/openstreetmap/josm/gui/history/HistoryBrowser.java

@@ -5 +5 @@
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
-import java.util.Arrays;
+import java.util.stream.Stream;
 
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -161 +161 @@
             model.unlinkAsListener();
             model = null;
         }
-        Arrays.asList(tagInfoViewer, nodeListViewer, relationMemberListViewer, coordinateInfoViewer).stream()
+        Stream.of(tagInfoViewer, nodeListViewer, relationMemberListViewer, coordinateInfoViewer)
                 .filter(Destroyable.class::isInstance).forEach(Destroyable::destroy);
         tagInfoViewer = null;
         nodeListViewer = null;

src/org/openstreetmap/josm/gui/io/importexport/GpxExporter.java

@@ -78 +78 @@
 
     @Override
     public boolean acceptFile(File pathname, Layer layer) {
-        return isSupportedLayer(layer) ? super.acceptFile(pathname, layer) : false;
+        return isSupportedLayer(layer) && super.acceptFile(pathname, layer);
     }
 
     @Override

src/org/openstreetmap/josm/gui/io/importexport/GpxLikeImporter.java

@@ -74 +74 @@
         msg.append("</html>");
         if (success) {
             SwingUtilities.invokeLater(() -> new Notification(
-                    "<h3>" + tr("Import success:") + "</h3>" + msg.toString())
+                    "<h3>" + tr("Import success:") + "</h3>" + msg)
                     .setIcon(JOptionPane.INFORMATION_MESSAGE)
                     .show());
         } else {

src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java

@@ -53 +53 @@
     private JosmComboBox<Changeset> cbOpenChangesets;
     private JosmComboBoxModel<Changeset> model;
     private JCheckBox cbCloseAfterUpload;
-    private JButton btnClose;
 
     /**
      * Constructs a new {@code ChangesetManagementPanel}.
@@ -126 +125 @@
 
         gc.gridx++;
         CloseChangesetAction closeChangesetAction = new CloseChangesetAction();
-        btnClose = new JButton(closeChangesetAction);
+        JButton btnClose = new JButton(closeChangesetAction);
         btnClose.setPreferredSize(prefSize);
         btnClose.setMinimumSize(prefSize);
         add(btnClose, gc);
@@ -277 +276 @@
     @Override
     public void changesetCacheUpdated(ChangesetCacheEvent event) {
         // This listener might have been called by a background task.
-        SwingUtilities.invokeLater(() -> refreshCombo());
+        SwingUtilities.invokeLater(this::refreshCombo);
     }
 }

src/org/openstreetmap/josm/gui/io/CustomConfigurator.java

@@ -130 +130 @@
      * @param unzip - if true file wil be unzipped and deleted after download
      */
     public static void processDownloadOperation(String address, String path, String parentDir, boolean mkdir, boolean unzip) {
-        String dir = parentDir;
         if (path.contains("..") || path.startsWith("/") || path.contains(":")) {
             return; // some basic protection
         }
-        File fOut = new File(dir, path);
+        File fOut = new File(parentDir, path);
         DownloadFileTask downloadFileTask = new DownloadFileTask(MainApplication.getMainFrame(), address, fOut, mkdir, unzip);
 
         MainApplication.worker.submit(downloadFileTask);

src/org/openstreetmap/josm/gui/io/UploadDialogModel.java

@@ -75 +75 @@
      * @return the hashtags separated by ";" or null
      */
     String findHashTags(String comment) {
-        String hashtags = String.join(";",
-            Arrays.stream(comment.split("\\s", -1))
-                .map(s -> Utils.strip(s, ",;"))
-                .filter(s -> s.matches("#[a-zA-Z0-9][-_a-zA-Z0-9]+"))
-                .collect(Collectors.toList()));
+        String hashtags = Arrays.stream(comment.split("\\s", -1))
+            .map(s -> Utils.strip(s, ",;"))
+            .filter(s -> s.matches("#[a-zA-Z0-9][-_a-zA-Z0-9]+"))
+            .collect(Collectors.joining(";"));
         return hashtags.isEmpty() ? null : hashtags;
     }
 
@@ -155 +154 @@
      */
     public void putAll(Map<String, String> map) {
         commitPendingEdit();
-        map.forEach((key, value) -> doPut(key, value));
+        map.forEach(this::doPut);
         setDirty(true);
         fireTableDataChanged();
     }

src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java

@@ -9 +9 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Comparator;
+import java.util.List;
 import java.util.stream.Collectors;
 
 import javax.swing.AbstractAction;
@@ -125 +125 @@
         URL url = Utils.fileToURL(audioFile);
         boolean hasTracks = !Utils.isEmpty(layer.data.tracks);
         boolean hasWaypoints = !Utils.isEmpty(layer.data.waypoints);
-        Collection<WayPoint> waypoints = new ArrayList<>();
+        List<WayPoint> waypoints = new ArrayList<>();
         boolean timedMarkersOmitted = false;
         boolean untimedMarkersOmitted = false;
         double snapDistance = Config.getPref().getDouble("marker.audiofromuntimedwaypoints.distance", 1.0e-3);
@@ -272 +272 @@
         }
 
         // we must have got at least one waypoint now
-        ((ArrayList<WayPoint>) waypoints).sort(Comparator.naturalOrder());
+        waypoints.sort(Comparator.naturalOrder());
 
         firstTime = -1.0; // this time of the first waypoint, not first trackpoint
         for (WayPoint w : waypoints) {

src/org/openstreetmap/josm/gui/layer/imagery/ColorfulFilter.java

@@ -212 +212 @@
         int val = (int) (colorfulness * color + (1 - colorfulness) * luminosity);
         if (val < 0) {
             return 0;
-        } else if (val > 0xff) {
-            return 0xff;
-        } else {
-            return val;
-        }
+        } else return Math.min(val, 0xff);
     }
 
     private byte mix(int color, double luminosity) {

src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -778 +778 @@
     private void zoomChanged(boolean invalidate) {
         Logging.debug("zoomChanged(): {0}", currentZoomLevel);
         if (tileLoader instanceof TMSCachedTileLoader) {
-            ((TMSCachedTileLoader) tileLoader).cancelOutstandingTasks();
+            tileLoader.cancelOutstandingTasks();
         }
         if (invalidate) {
             invalidate();
@@ -1148 +1148 @@
             StringBuilder line = new StringBuilder();
             StringBuilder ret = new StringBuilder();
             for (String s: text.split(" ", -1)) {
-                if (g.getFontMetrics().stringWidth(line.toString() + s) > tileSource.getTileSize()) {
+                if (g.getFontMetrics().stringWidth(line + s) > tileSource.getTileSize()) {
                     ret.append(line).append('\n');
                     line.setLength(0);
                 }

src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj

@@ -710 +710 @@
 Condition simple_key_condition(Context context) :
 {
     boolean not = false;
-    KeyMatchType matchType = null;;
+    KeyMatchType matchType = null;
     String key;
 }
 {
@@ -731 +731 @@
     String val;
     float f;
     int i;
-    KeyMatchType matchType = null;;
+    KeyMatchType matchType = null;
     Op op;
     boolean considerValAsKey = false;
 }

src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java

@@ -19 +19 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import oauth.signpost.OAuth;
+import oauth.signpost.OAuthConsumer;
+import oauth.signpost.OAuthProvider;
+import oauth.signpost.exception.OAuthException;
 import org.openstreetmap.josm.data.oauth.OAuthParameters;
 import org.openstreetmap.josm.data.oauth.OAuthToken;
 import org.openstreetmap.josm.data.oauth.OsmPrivileges;
@@ -30 +34 @@
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
 
-import oauth.signpost.OAuth;
-import oauth.signpost.OAuthConsumer;
-import oauth.signpost.OAuthProvider;
-import oauth.signpost.exception.OAuthException;
-
 /**
  * An OAuth 1.0 authorization client.
  * @since 2746
@@ -198 +197 @@
 
         for (String setCookie: setCookies) {
             String[] kvPairs = setCookie.split(";", -1);
-            if (kvPairs.length == 0) {
-                continue;
-            }
             for (String kvPair : kvPairs) {
                 kvPair = kvPair.trim();
                 String[] kv = kvPair.split("=", -1);

src/org/openstreetmap/josm/gui/preferences/advanced/AbstractTableListEditor.java

@@ -107 +107 @@
         public void valueChanged(ListSelectionEvent e) {
             TableCellEditor editor = table.getCellEditor();
             if (editor != null) {
-                ((DefaultCellEditor) editor).stopCellEditing();
+                editor.stopCellEditing();
             }
             if (entryList.getSelectedIndices().length != 1) {
                 entryIdx = null;

src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java

@@ -90 +90 @@
     public String getCurrentCode() {
         int zone = index + 1;
         int code = 32600 + zone + (hemisphere == Hemisphere.South ? 100 : 0);
-        return "EPSG:" + Integer.toString(code);
+        return "EPSG:" + code;
     }
 
     @Override

src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

@@ -1249 +1249 @@
             sc = ((JosmAction) action.getAction()).getShortcut();
             if (sc.getAssignedKey() == KeyEvent.CHAR_UNDEFINED) {
                 sc = null;
-        }
+            }
         }
 
         long paramCode = 0;

src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java

@@ -10 +10 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
@@ -311 +310 @@
         }
 
         if (values_sort && TaggingPresets.SORT_MENU.get()) {
-            Collections.sort(presetListEntries, (a, b) -> AlphanumComparator.getInstance().compare(a.getDisplayValue(), b.getDisplayValue()));
+            presetListEntries.sort((a, b) -> AlphanumComparator.getInstance().compare(a.getDisplayValue(), b.getDisplayValue()));
         }
     }
 

src/org/openstreetmap/josm/gui/tagging/presets/items/PresetListEntry.java

@@ -82 +82 @@
      */
     public String getListDisplay(int width) {
         String displayValue = getDisplayValue();
-        Integer count = getCount();
+        int count = getCount();
 
         if (count > 0 && cms.usage.getSelectedCount() > 1) {
             displayValue = tr("{0} ({1})", displayValue, count);

src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java

@@ -278 +278 @@
                         try {
                             result.attachImageIcon(this, true);
                         } catch (IllegalArgumentException e) {
-                            Logging.warn(toString() + ": " + PRESET_ICON_ERROR_MSG_PREFIX + iconName);
+                            Logging.warn(this + ": " + PRESET_ICON_ERROR_MSG_PREFIX + iconName);
                             Logging.warn(e);
                         } finally {
                             iconFuture.complete(null);
                         }
                     });
                 } else {
-                    Logging.warn(toString() + ": " + PRESET_ICON_ERROR_MSG_PREFIX + iconName);
+                    Logging.warn(this + ": " + PRESET_ICON_ERROR_MSG_PREFIX + iconName);
                     iconFuture.complete(null);
                 }
             });

src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java

@@ -530 +530 @@
      */
     public List<String> getKeys() {
         return tags.stream()
-                .filter(tag -> !Utils.isStripEmpty(tag.getName()))
                 .map(TagModel::getName)
+                .filter(name -> !Utils.isStripEmpty(name))
                 .collect(Collectors.toList());
     }
 

src/org/openstreetmap/josm/gui/MapStatus.java

@@ -645 +645 @@
             osm.visitKeys((primitive, key, value) -> text.append("<br>").append(key).append('=').append(value));
 
             final JLabel l = new JLabel(
-                    "<html>" + text.toString() + "</html>",
+                    "<html>" + text + "</html>",
                     ImageProvider.get(osm.getDisplayType()),
                     JLabel.HORIZONTAL
                     ) {

src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java

@@ -202 +202 @@
          */
         if (GLOBAL_CONFIRMATION.get()) {
             // Ensure dialog box does not exceed main window size
-            Integer maxWidth = (int) Math.max(200, MainApplication.getMainFrame().getWidth()*0.6);
+            int maxWidth = (int) Math.max(200, MainApplication.getMainFrame().getWidth()*0.6);
             String message = "<html><div>" + getPermissionMessage() +
                     "<br/>" + tr("Do you want to allow this?") + "</div></html>";
             JLabel label = new JLabel(message);
@@ -356 +356 @@
     protected DownloadParams getDownloadParams() {
         DownloadParams result = new DownloadParams();
         if (args != null) {
-            result = result
-                .withNewLayer(isLoadInNewLayer())
-                .withLayerName(args.get("layer_name"))
-                .withLocked(get("layer_locked"))
-                .withDownloadPolicy(get("download_policy", DownloadPolicy::of, () -> DownloadPolicy.NORMAL))
-                .withUploadPolicy(get("upload_policy", UploadPolicy::of, () -> UploadPolicy.NORMAL));
+            result
+                    .withNewLayer(isLoadInNewLayer())
+                    .withLayerName(args.get("layer_name"))
+                    .withLocked(get("layer_locked"))
+                    .withDownloadPolicy(get("download_policy", DownloadPolicy::of, () -> DownloadPolicy.NORMAL))
+                    .withUploadPolicy(get("upload_policy", UploadPolicy::of, () -> UploadPolicy.NORMAL));
         }
         return result;
     }

src/org/openstreetmap/josm/io/ChangesetQuery.java

@@ -264 +264 @@
      * Restricts the result to changesets which have been closed after the date given by <code>d</code>.
      * <code>d</code> d is a date relative to the current time zone.
      *
-     * @param d the date . Must not be null.
+     * @param d the date. Must not be null.
      * @return the restricted changeset query
      * @throws IllegalArgumentException if d is null
      */
@@ -368 +368 @@
             if (sb.length() > 0) {
                 sb.append('&');
             }
-            sb.append("open=").append(Boolean.toString(open));
+            sb.append("open=").append(open);
         } else if (closed != null) {
             if (sb.length() > 0) {
                 sb.append('&');
             }
-            sb.append("closed=").append(Boolean.toString(closed));
+            sb.append("closed=").append(closed);
         } else if (changesetIds != null) {
             // since 2013-12-05, see https://github.com/openstreetmap/openstreetmap-website/commit/1d1f194d598e54a5d6fb4f38fb569d4138af0dc8
             if (sb.length() > 0) {
@@ -569 +569 @@
          * <code>query</code> is the query part of a API url for querying changesets,
          * see <a href="http://wiki.openstreetmap.org/wiki/API_v0.6#Query:_GET_.2Fapi.2F0.6.2Fchangesets">OSM API</a>.
          *
-         * Example for an query string:<br>
+         * Example for a query string:<br>
          * <pre>
          *    uid=1234&amp;open=true
          * </pre>

src/org/openstreetmap/josm/plugins/PluginHandler.java

@@ -465 +465 @@
         } else {
             long tim = System.currentTimeMillis();
             long last = Config.getPref().getLong("pluginmanager.lastupdate", 0);
-            Integer maxTime = Config.getPref().getInt("pluginmanager.time-based-update.interval", DEFAULT_TIME_BASED_UPDATE_INTERVAL);
+            int maxTime = Config.getPref().getInt("pluginmanager.time-based-update.interval", DEFAULT_TIME_BASED_UPDATE_INTERVAL);
             long d = TimeUnit.MILLISECONDS.toDays(tim - last);
             if ((last <= 0) || (maxTime <= 0)) {
                 Config.getPref().put("pluginmanager.lastupdate", Long.toString(tim));
@@ -1020 +1020 @@
         }
         try {
             monitor.beginTask(tr("Determining plugins to load..."));
-            Set<String> plugins = new HashSet<>(Config.getPref().getList("plugins", new LinkedList<String>()));
+            Set<String> plugins = new HashSet<>(Config.getPref().getList("plugins", new LinkedList<>()));
             Logging.debug("Plugins list initialized to {0}", plugins);
             String systemProp = Utils.getSystemProperty("josm.plugins");
             if (systemProp != null) {

src/org/openstreetmap/josm/tools/ColorScale.java

@@ -249 +249 @@
         FontMetrics fm = g.getFontMetrics();
         fh = fm.getHeight()/2;
         if (colorBarTitles != null && colorBarTitles.length > 0) {
-             fw = Arrays.asList(colorBarTitles).stream().mapToInt(title -> fm.stringWidth(title)).max().orElse(50);
+             fw = Arrays.stream(colorBarTitles).mapToInt(fm::stringWidth).max().orElse(50);
         } else {
             fw = fm.stringWidth(
                     String.valueOf(Math.max((int) Math.abs(max * valueScale), (int) Math.abs(min * valueScale))))

src/org/openstreetmap/josm/tools/OsmUrlToBounds.java

@@ -135 +135 @@
             return Double.parseDouble(map.get(key));
         if (map.containsKey('m'+key))
             return Double.parseDouble(map.get('m'+key));
-        throw new IllegalArgumentException(map.toString() + " does not contain " + key);
+        throw new IllegalArgumentException(map + " does not contain " + key);
     }
 
     private static final char[] SHORTLINK_CHARS = {

src/org/openstreetmap/josm/tools/Shortcut.java

@@ -521 +521 @@
     // and now the workhorse. same parameters as above, just one more
     private static Shortcut registerShortcut(String shortText, String longText, int requestedKey, int requestedGroup, Integer modifier) {
         doInit();
-        Integer defaultModifier = findModifier(requestedGroup, modifier);
+        int defaultModifier = findModifier(requestedGroup, modifier);
         final Optional<Shortcut> existing = findShortcutByKeyOrShortText(requestedKey, defaultModifier, shortText);
         if (existing.isPresent() && shortText.equals(existing.get().getShortText())) {
             // a re-register? maybe a sc already read from the preferences?

src/org/openstreetmap/josm/tools/Utils.java

@@ -1642 +1642 @@
             throw new IllegalArgumentException(MessageFormat.format("Parameter min ({0}) cannot be greater than max ({1})", min, max));
         } else if (val < min) {
             return min;
-        } else if (val > max) {
-            return max;
-        } else {
-            return val;
-        }
+        } else return Math.min(val, max);
     }
 
     /**
@@ -1663 +1659 @@
             throw new IllegalArgumentException(MessageFormat.format("Parameter min ({0}) cannot be greater than max ({1})", min, max));
         } else if (val < min) {
             return min;
-        } else if (val > max) {
-            return max;
-        } else {
-            return val;
-        }
+        } else return Math.min(val, max);
     }
 
     /**
@@ -1761 +1753 @@
         int bPos = version.indexOf('b');
         int pPos = version.indexOf('+');
         try {
-            return Integer.parseInt(version.substring(bPos > -1 ? bPos + 1 : pPos + 1, version.length()));
+            return Integer.parseInt(version.substring(bPos > -1 ? bPos + 1 : pPos + 1));
         } catch (NumberFormatException e) {
             Logging.trace(e);
             return 0;
@@ -1827 +1819 @@
 
     /**
      * Determines if a class can be found for the given name.
-     * @param className class nmae to find
+     * @param className class name to find
      * @return {@code true} if the class can be found, {@code false} otherwise
      * @since 17692
      */

test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandlingTest.java

@@ -6 +6 @@
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.jupiter.api.extension.RegisterExtension;
+import java.util.Collections;
+import java.util.HashSet;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
-import java.util.Collections;
-import java.util.HashSet;
-
 /**
  * Some unit test cases for basic tag management on {@link OsmPrimitive}. Uses
  * {@link Node} for the tests, {@link OsmPrimitive} is abstract.
@@ -192 +191 @@
     private void testGetKey(OsmPrimitive p, String key, String value) {
         assertEquals(value != null, p.hasKey(key));
         assertEquals(value != null, p.getKeys().containsKey(key));
-        assertEquals(value != null, p.getKeys().keySet().contains(key));
         assertEquals(value, p.get(key));
-        assertEquals(value, p.getKeys().get(key));
     }
-
 }

test/unit/org/openstreetmap/josm/io/GpxReaderTest.java

@@ -6 +6 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.ByteArrayInputStream;
-import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -14 +13 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
-
-import org.junit.jupiter.api.Test;
 import org.xml.sax.SAXException;
 
 /**
@@ -38 +36 @@
      */
     public static GpxData parseGpxData(String filename) throws IOException, SAXException {
         final GpxData result;
-        try (FileInputStream in = new FileInputStream(new File(filename))) {
+        try (FileInputStream in = new FileInputStream(filename)) {
             GpxReader reader = new GpxReader(in);
             assertTrue(reader.parse(false));
             result = reader.getGpxData();

test/unit/org/openstreetmap/josm/testutils/mockers/EDTAssertionMocker.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.testutils.mockers;
 
-import org.openstreetmap.josm.gui.util.GuiHelper;
-
 import mockit.Invocation;
 import mockit.Mock;
 import mockit.MockUp;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 
 /**
  * MockUp that, when applied, should cause calls to the EDT which would normally swallow generated
@@ -16 +15 @@
     static void handleEDTException(final Invocation invocation, final Throwable t) throws Throwable {
         final Throwable cause = t.getCause();
         if (cause instanceof AssertionError) {
-            throw (AssertionError) cause;
+            throw cause;
         }
 
         invocation.proceed(t);