7108280: JList.getSelectedValuesList fails if JList.setSelectionInterval larger than list
Reviewed-by: serb, kaddepalli
--- a/src/java.desktop/share/classes/javax/swing/JList.java Wed Mar 14 15:41:29 2018 +0530
+++ b/src/java.desktop/share/classes/javax/swing/JList.java Thu Mar 15 19:33:51 2018 +0530
@@ -2269,10 +2269,12 @@
int iMin = sm.getMinSelectionIndex();
int iMax = sm.getMaxSelectionIndex();
-
- if ((iMin < 0) || (iMax < 0)) {
+ int size = dm.getSize();
+
+ if ((iMin < 0) || (iMax < 0) || (iMin >= size)) {
return new Object[0];
}
+ iMax = iMax < size ? iMax : size - 1;
Object[] rvTmp = new Object[1+ (iMax - iMin)];
int n = 0;
@@ -2304,10 +2306,12 @@
int iMin = sm.getMinSelectionIndex();
int iMax = sm.getMaxSelectionIndex();
-
- if ((iMin < 0) || (iMax < 0)) {
+ int size = dm.getSize();
+
+ if ((iMin < 0) || (iMax < 0) || (iMin >= size)) {
return Collections.emptyList();
}
+ iMax = iMax < size ? iMax : size - 1;
List<E> selectedItems = new ArrayList<E>();
for(int i = iMin; i <= iMax; i++) {
@@ -2353,7 +2357,8 @@
@BeanProperty(bound = false)
public E getSelectedValue() {
int i = getMinSelectionIndex();
- return (i == -1) ? null : getModel().getElementAt(i);
+ return ((i == -1) || (i >= getModel().getSize())) ? null :
+ getModel().getElementAt(i);
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/javax/swing/JList/GetSelectedValueTest.java Thu Mar 15 19:33:51 2018 +0530
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+/*
+ * @test
+ * @key headful
+ * @bug 7108280
+ * @summary Verifies that getSelectedValue works fine without crash when
+ * the setSelectionInterval was called with indices outside the
+ * range of data present in DataModel
+ * @run main GetSelectedValueTest
+ */
+
+import javax.swing.SwingUtilities;
+import javax.swing.DefaultListModel;
+import javax.swing.JList;
+import javax.swing.ListSelectionModel;
+import java.util.Objects;
+
+public class GetSelectedValueTest {
+ public static void main(String[] args) throws Exception {
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ // Create a JList with 2 elements
+ DefaultListModel dlm = new DefaultListModel();
+ JList list = new JList<String>(dlm);
+ list.setSelectionMode(
+ ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+ dlm.addElement("1");
+ dlm.addElement("2");
+
+ // Set the selection interval from 0-2 (3 elements instead
+ // of 2). The getSelectedValue should return the first
+ // selected element
+ list.setSelectionInterval(0, 2);
+ checkSelectedIndex(list, "1");
+
+ //here the smallest selection index is bigger than number of
+ // elements in list. This should return null.
+ list.setSelectionInterval(4, 5);
+ checkSelectedIndex(list,null);
+ }
+ });
+ }
+
+ static void checkSelectedIndex(JList list, Object value)
+ throws RuntimeException {
+ Object selectedObject = list.getSelectedValue();
+ if (!Objects.equals(value, selectedObject)) {
+ System.out.println("Expected: " + value);
+ System.out.println("Actual: " + selectedObject);
+ throw new RuntimeException("Wrong selection");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/javax/swing/JList/GetSelectedValuesListTest.java Thu Mar 15 19:33:51 2018 +0530
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+/*
+ * @test
+ * @key headful
+ * @bug 7108280
+ * @summary Verifies that getSelectedValuesList works fine without crash when
+ * the setSelectionInterval was called with indices outside the
+ * range of data present in DataModel
+ * @run main GetSelectedValuesListTest
+ */
+
+import javax.swing.SwingUtilities;
+import javax.swing.DefaultListModel;
+import javax.swing.JList;
+import javax.swing.ListSelectionModel;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+
+public class GetSelectedValuesListTest {
+ public static void main(String[] args) throws Exception {
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ // Create a JList with 2 elements
+ DefaultListModel dlm = new DefaultListModel();
+ JList list = new JList<String>(dlm);
+ list.setSelectionMode(
+ ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+ dlm.addElement("1");
+ dlm.addElement("2");
+
+ // Set the selection interval from 0-2 (3 elements instead
+ // of 2). The getSelectedValuesList should return the list of
+ // objects present in the list in the given interval
+ list.setSelectionInterval(0, 2);
+ checkSelection(list, List.of("1", "2"));
+
+ //here the selection interval is set greater than number of
+ // elements in list. This should return empty list
+ list.setSelectionInterval(4, 10);
+ checkSelection(list, Collections.emptyList());
+
+ // This will set the selection interval from 0 to 2 index.
+ // The getSelectedValuesList should return the list of
+ // objects present in the list in the given interval
+ list.getSelectionModel().setSelectionInterval(0, 2);
+ checkSelection(list, List.of("1", "2"));
+ }
+ });
+ }
+
+ static void checkSelection(JList list, List<String> selectionList)
+ throws RuntimeException
+ {
+ List<String> listSelection = list.getSelectedValuesList();
+ if (!listSelection.equals(selectionList)) {
+ System.out.println("Expected: " + selectionList);
+ System.out.println("Actual: " + listSelection);
+ throw new RuntimeException("Wrong selection from " +
+ "getSelectedValuesList");
+ }
+
+ Object[] arraySelection = list.getSelectedValues();
+ if (!Arrays.equals(arraySelection, selectionList.toArray())) {
+ System.out.println("Expected: " + selectionList);
+ System.out.println("Actual: " + Arrays.asList(arraySelection));
+ throw new RuntimeException("Wrong selection from " +
+ "getSelectedValues");
+ }
+ }
+}