Changeset 17773 in josm for trunk

Timestamp:

2021-04-13T22:20:22+02:00 (4 years ago)

Author:

simon04

Message:

see #20745 - Introduce TableHelper.selectedIndices

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/RestorePropertyAction.java (modified) (2 diffs)
• gui/dialogs/LayerListDialog.java (modified) (3 diffs)
• gui/dialogs/relation/MemberTableModel.java (modified) (6 diffs)
• gui/history/SelectionSynchronizer.java (modified) (3 diffs)
• gui/util/ReorderableTableModel.java (modified) (2 diffs)
• gui/util/TableHelper.java (modified) (2 diffs)
• tools/ArrayUtils.java (deleted)

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

@@ -6 +6 @@
 import java.awt.event.ActionEvent;
 import java.util.Collections;
-import java.util.HashMap;
+import java.util.Map;
 import java.util.function.IntFunction;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
 import javax.swing.AbstractAction;
@@ -54 +55 @@
         if (primitive == null) return;
 
-        HashMap<String, String> changes = new HashMap<>();
-        for (int index : TableHelper.getSelectedIndices(selectionModel)) {
-            changes.put(keyFn.apply(index), valueFn.apply(index));
-        }
+        Map<String, String> changes = TableHelper.selectedIndices(selectionModel).boxed()
+                .collect(Collectors.toMap(keyFn::apply, valueFn::apply, (a, b) -> b));
         ChangePropertyCommand command = new ChangePropertyCommand(Collections.singleton(primitive), changes);
         UndoRedoHandler.getInstance().add(command);

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

@@ -90 +90 @@
 import org.openstreetmap.josm.gui.widgets.ScrollableTable;
 import org.openstreetmap.josm.spi.preferences.Config;
-import org.openstreetmap.josm.tools.ArrayUtils;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
@@ -892 +891 @@
          */
         public List<Integer> getSelectedRows() {
-            return ArrayUtils.toList(TableHelper.getSelectedIndices(selectionModel));
+            return TableHelper.selectedIndices(selectionModel).boxed().collect(Collectors.toList());
         }
 
@@ -905 +904 @@
             layer.removePropertyChangeListener(this);
             final int size = getRowCount();
-            final int[] rows = TableHelper.getSelectedIndices(selectionModel);
-
-            if (rows.length == 0 && size > 0) {
+
+            if (selectionModel.isSelectionEmpty() && size > 0) {
                 selectionModel.setSelectionInterval(size-1, size-1);
             }

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

@@ -3 +3 @@
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.BitSet;
 import java.util.Collection;
@@ -51 +50 @@
 import org.openstreetmap.josm.gui.util.SortableTableModel;
 import org.openstreetmap.josm.gui.widgets.OsmPrimitivesTableModel;
-import org.openstreetmap.josm.tools.ArrayUtils;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.bugreport.BugReport;
@@ -513 +511 @@
      */
     public Collection<RelationMember> getSelectedMembers() {
-        return Arrays.stream(getSelectedIndices())
+        return selectedIndices()
                 .mapToObj(members::get)
                 .collect(Collectors.toList());
@@ -692 +690 @@
         addToSelectedMembers(selected);
         getSelectionModel().setValueIsAdjusting(false);
-        int[] selectedIndices = getSelectedIndices();
-        if (selectedIndices.length > 0) {
-            fireMakeMemberVisible(selectedIndices[0]);
-        }
+        selectedIndices().findFirst().ifPresent(this::fireMakeMemberVisible);
     }
 
@@ -723 +718 @@
         } else {
             sortedMembers = relationSorter.sortMembers(selectedMembers);
-            List<Integer> selectedIndices = ArrayUtils.toList(getSelectedIndices());
+            List<Integer> selectedIndices = selectedIndices().boxed().collect(Collectors.toList());
             newMembers = new ArrayList<>();
             boolean inserted = false;
@@ -784 +779 @@
     @Override
     public void reverse() {
-        List<Integer> selectedIndices = ArrayUtils.toList(getSelectedIndices());
-        List<Integer> selectedIndicesReversed = ArrayUtils.toList(getSelectedIndices());
+        List<Integer> selectedIndices = selectedIndices().boxed().collect(Collectors.toList());
+        List<Integer> selectedIndicesReversed = selectedIndices().boxed().collect(Collectors.toList());
 
         if (selectedIndices.size() <= 1) {

trunk/src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.history;
 
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Objects;
@@ -61 +60 @@
         preventRecursion = true;
         ListSelectionModel referenceModel = (ListSelectionModel) e.getSource();
-        int[] selectedIndices = TableHelper.getSelectedIndices(referenceModel);
         for (ListSelectionModel model : participants) {
             if (model == referenceModel) {
@@ -67 +65 @@
             }
             TableHelper.setSelectedIndices(model,
-                    Arrays.stream(selectedIndices).flatMap(i -> selectionIndexMapper.apply(i, referenceModel)));
+                    TableHelper.selectedIndices(referenceModel).flatMap(i -> selectionIndexMapper.apply(i, referenceModel)));
         }
         preventRecursion = false;

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

@@ -3 +3 @@
 
 import java.util.Arrays;
+import java.util.stream.IntStream;
 
 import javax.swing.JList;
@@ -38 +39 @@
      * Returns an array of all of the selected indices in the selection model, in increasing order.
      * @return an array of all of the selected indices in the selection model, in increasing order
+     * @see #selectedIndices()
      */
     default int[] getSelectedIndices() {
         return TableHelper.getSelectedIndices(getSelectionModel());
+    }
+
+    /**
+     * Returns a stream of all of the selected indices in the selection model, in increasing order.
+     * @return a stream of all of the selected indices in the selection model, in increasing order
+     * @since 17773
+     */
+    default IntStream selectedIndices() {
+        return TableHelper.selectedIndices(getSelectionModel());
     }
 

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
-     * Code taken from OpenJDK 11. To be removed when we switch to Java 11 or later.
+     *
+     * To be removed when we switch to Java 11 or later.
      *
      * @param selectionModel list selection model.
@@ -130 +131 @@
      *         or an empty array if nothing is selected
      * @since 15226
+     * @see #selectedIndices(ListSelectionModel)
      */
     public static int[] getSelectedIndices(ListSelectionModel selectionModel) {
-        int iMin = selectionModel.getMinSelectionIndex();
-        int iMax = selectionModel.getMaxSelectionIndex();
+        return selectedIndices(selectionModel).toArray();
+    }
 
-        if (iMin < 0 || iMax < 0) {
-            return new int[0];
+    /**
+     * Returns a stream of all of the selected indices in the selection model, in increasing order.
+     *
+     * @param selectionModel list selection model.
+     *
+     * @return all of the selected indices, in increasing order,
+     *         or an empty stream if nothing is selected
+     * @since 17773
+     */
+    public static IntStream selectedIndices(ListSelectionModel selectionModel) {
+        if (selectionModel.isSelectionEmpty()) {
+            return IntStream.empty();
         }
-
-        int[] rvTmp = new int[1 + iMax - iMin];
-        int n = 0;
-        for (int i = iMin; i <= iMax; i++) {
-            if (selectionModel.isSelectedIndex(i)) {
-                rvTmp[n++] = i;
-            }
-        }
-        int[] rv = new int[n];
-        System.arraycopy(rvTmp, 0, rv, 0, n);
-        return rv;
+        return IntStream.rangeClosed(selectionModel.getMinSelectionIndex(), selectionModel.getMaxSelectionIndex())
+                .filter(selectionModel::isSelectedIndex);
     }