Changeset 19120 in josm for trunk

Timestamp:

2024-06-20T15:55:07+02:00 (3 months ago)

Author:

taylor.smock

Message:

See #17858: Update code for newer Java features

Also add a note that toUnmodifiableList does not like nulls.

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/ShowStatusReportAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java (modified) (5 diffs)
• src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/util/ReorderableTableModel.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/util/TableHelper.java (modified) (2 diffs)
• src/org/openstreetmap/josm/tools/PlatformHook.java (modified) (2 diffs)
• src/org/openstreetmap/josm/tools/PlatformHookOsx.java (modified) (1 diff)
• src/org/openstreetmap/josm/tools/StreamUtils.java (modified) (1 diff)
• test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTestFT.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/osm/ChangesetTest.java (modified) (2 diffs)

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

@@ -113 +113 @@
                 if (dm != null) {
                     AffineTransform transform = gd.getDefaultConfiguration().getDefaultTransform();
-                    // Java 11: use DisplayMode#toString
-                    text.format(Locale.ROOT, " %d\u00D7%d (scaling %.2f\u00D7%.2f)",
-                            dm.getWidth(), dm.getHeight(), transform.getScaleX(), transform.getScaleY());
+                    text.format(Locale.ROOT, " %s (scaling %.2f\u00D7%.2f)",
+                            dm, transform.getScaleX(), transform.getScaleY());
                 }
             }

trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java

@@ -49 +49 @@
 /**
  * Panel to inspect one or more OsmPrimitives.
- *
+ * <p>
  * Gives an unfiltered view of the object's internal state.
  * Might be useful for power users to give more detailed bug reports and
@@ -129 +129 @@
                 String heading = tr("Styles for \"{0}\":", osm.getDisplayName(DefaultNameFormatter.getInstance()));
                 txtMappaint.println(heading);
-                txtMappaint.println(repeatString("=", heading.length()));
+                txtMappaint.println("=".repeat(heading.length()));
 
                 MultiCascade mc = new MultiCascade();
@@ -137 +137 @@
                         heading = tr("{0} style \"{1}\"", getSort(s), s.getDisplayString());
                         txtMappaint.println(heading);
-                        txtMappaint.println(repeatString("-", heading.length()));
+                        txtMappaint.println("-".repeat(heading.length()));
                         s.apply(mc, osm, scale, false);
                         txtMappaint.println(tr("Display range: {0}", mc.range));
@@ -150 +150 @@
                 heading = tr("List of generated Styles:");
                 txtMappaint.println(heading);
-                txtMappaint.println(repeatString("-", heading.length()));
+                txtMappaint.println("-".repeat(heading.length()));
                 StyleElementList sl = elemstyles.get(osm, scale, nc);
                 for (StyleElement s : sl) {
@@ -177 +177 @@
         }
         return stringWriter.toString();
-    }
-
-    private static String repeatString(String string, int count) {
-        // Java 11: use String.repeat
-        return new String(new char[count]).replace("\0", string);
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java

@@ -90 +90 @@
      */
     public List<Changeset> getSelectedChangesets() {
-        return Arrays.stream(TableHelper.getSelectedIndices(selectionModel))
+        return Arrays.stream(selectionModel.getSelectedIndices())
                 .map(sorter::convertRowIndexToModel).mapToObj(data::get).collect(Collectors.toList());
     }

trunk/src/org/openstreetmap/josm/gui/util/ReorderableTableModel.java

@@ -42 +42 @@
      */
     default int[] getSelectedIndices() {
-        return TableHelper.getSelectedIndices(getSelectionModel());
+        return getSelectionModel().getSelectedIndices();
     }
 

trunk/src/org/openstreetmap/josm/gui/util/TableHelper.java

@@ -123 +123 @@
      * Unfortunately this method is not available in OpenJDK before version 11, see
      * https://bugs.openjdk.java.net/browse/JDK-8199395
-     *
+     * <p>
      * To be removed when we switch to Java 11 or later.
      *
@@ -132 +132 @@
      * @see #selectedIndices(ListSelectionModel)
      * @since 15226
+     * @deprecated Use {@link ListSelectionModel#getSelectedIndices()} instead
      */
+    @Deprecated(since = "19120")
     public static int[] getSelectedIndices(ListSelectionModel selectionModel) {
-        return selectedIndices(selectionModel).toArray();
+        return selectionModel.getSelectedIndices();
     }
 

trunk/src/org/openstreetmap/josm/tools/PlatformHook.java

@@ -248 +248 @@
     /**
      * Returns extended modifier key used as the appropriate accelerator key for menu shortcuts.
-     * It is advised everywhere to use {@link Toolkit#getMenuShortcutKeyMask()} to get the cross-platform modifier, but:
+     * It was advised everywhere to use {@link Toolkit#getMenuShortcutKeyMask()} to get the cross-platform modifier, but:
      * <ul>
      * <li>it returns KeyEvent.CTRL_MASK instead of KeyEvent.CTRL_DOWN_MASK. We used the extended
@@ -258 +258 @@
      */
     default int getMenuShortcutKeyMaskEx() {
-        // To remove when switching to Java 10+, and use Toolkit.getMenuShortcutKeyMaskEx instead
+        if (!GraphicsEnvironment.isHeadless()) {
+            return Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx();
+        }
         return InputEvent.CTRL_DOWN_MASK;
     }

trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java

@@ -104 +104 @@
         return !("true".equals(getSystemProperty("apple.laf.useScreenMenuBar"))
                 && ("Aqua".equals(laf) || laf.contains("Mac")));
-    }
-
-    @Override
-    public int getMenuShortcutKeyMaskEx() {
-        return InputEvent.META_DOWN_MASK;
     }
 

trunk/src/org/openstreetmap/josm/tools/StreamUtils.java

@@ -68 +68 @@
      */
     public static <T> Collector<T, ?, List<T>> toUnmodifiableList() {
-        // Java 10: use java.util.stream.Collectors.toUnmodifiableList
+        // Java 10: use java.util.stream.Collectors.toUnmodifiableList (note: does not like null checks OR null entries)
         return Collectors.collectingAndThen(Collectors.toList(), Utils::toUnmodifiableList);
     }

trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTestFT.java

@@ -3 +3 @@
 
 import java.awt.BorderLayout;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
 
 import javax.swing.JFrame;
@@ -24 +22 @@
             n1.put("key" + i, "value" + i);
         }
-        // Java 11: use String.repeat
-        String note = IntStream.range(0, 50).mapToObj(i -> " A very long text ").collect(Collectors.joining());
+        String note = " A very long text ".repeat(50);
         n1.put("note", note);
         w1.addNode(new Node(2));

trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetTest.java

@@ -14 +14 @@
 import java.util.HashMap;
 import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
 
 import org.junit.jupiter.api.Test;
@@ -57 +55 @@
         // Add a map with too long values => IllegalArgumentException
         keys = new HashMap<>();
-        // Java 11: use String.repeat
-        keys.put("test", IntStream.range(0, MAX_CHANGESET_TAG_LENGTH + 1).mapToObj(i -> "x").collect(Collectors.joining()));
+        keys.put("test", "x".repeat(MAX_CHANGESET_TAG_LENGTH + 1));
         try {
             cs.setKeys(keys);