--- a/src/java.desktop/share/classes/javax/swing/JList.java Thu Mar 15 19:33:04 2018 +0100
+++ b/src/java.desktop/share/classes/javax/swing/JList.java Thu Mar 15 11:36:11 2018 -0700
@@ -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);
}
--- a/src/java.desktop/share/classes/javax/swing/text/html/ImageView.java Thu Mar 15 19:33:04 2018 +0100
+++ b/src/java.desktop/share/classes/javax/swing/text/html/ImageView.java Thu Mar 15 11:36:11 2018 -0700
@@ -928,11 +928,11 @@
}
synchronized(ImageView.this) {
- if ((changed & 1) == 1 && (state & WIDTH_FLAG) == 0) {
- width = newWidth;
+ if ((changed & 1) == 1 && (state & HEIGHT_FLAG) == 0) {
+ height = newHeight;
}
- if ((changed & 2) == 2 && (state & HEIGHT_FLAG) == 0) {
- height = newHeight;
+ if ((changed & 2) == 2 && (state & WIDTH_FLAG) == 0) {
+ width = newWidth;
}
if ((state & LOADING_FLAG) == LOADING_FLAG) {
// No need to resize or repaint, still in the process of
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/javax/swing/JEditorPane/8195095/ImageViewTest.java Thu Mar 15 11:36:11 2018 -0700
@@ -0,0 +1,143 @@
+/*
+ * 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 8195095
+ * @summary Tests if Images are scaled correctly in JEditorPane.
+ * @run main ImageViewTest
+ */
+import java.awt.Robot;
+import java.awt.Point;
+import java.awt.Color;
+import java.awt.Insets;
+
+import javax.swing.JEditorPane;
+import javax.swing.SwingUtilities;
+import javax.swing.JFrame;
+import javax.swing.WindowConstants;
+
+public class ImageViewTest {
+
+ private static final int WIDTH = 200;
+ private static final int HEIGHT = 200;
+ private static JFrame f;
+
+ private static JEditorPane editorPane1;
+ private static JEditorPane editorPane2;
+ private static JEditorPane editorPane3;
+ private static JEditorPane editorPane4;
+
+ private static void test(Robot r, JEditorPane editorPane) throws Exception {
+
+ SwingUtilities.invokeAndWait(() -> {
+ f = new JFrame();
+ editorPane.setEditable(false);
+ f.add(editorPane);
+ f.setSize(220,240);
+ f.setLocationRelativeTo(null);
+
+ f.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
+ f.setVisible(true);
+ });
+
+ r.waitForIdle();
+ r.delay(500);
+
+ SwingUtilities.invokeAndWait(() -> {
+ Insets insets = editorPane.getInsets();
+ Point loc = editorPane.getLocationOnScreen();
+
+ final Color blue = Color.BLUE;
+ final int offset = 10;
+
+ Color center = r.getPixelColor(loc.x + insets.left + WIDTH / 2,
+ loc.y + insets.top + HEIGHT / 2);
+ Color left = r.getPixelColor(loc.x + insets.left + offset,
+ loc.y + insets.top + HEIGHT / 2);
+ Color right = r.getPixelColor(loc.x + insets.left + WIDTH - offset,
+ loc.y + insets.top + HEIGHT / 2);
+ Color bottom = r.getPixelColor(loc.x + insets.left + WIDTH / 2,
+ loc.y + insets.top + HEIGHT - offset);
+ Color top = r.getPixelColor(loc.x + insets.left + WIDTH / 2,
+ loc.y + insets.top + offset);
+
+ f.dispose();
+
+ System.out.println("center color: " + center);
+ System.out.println("left color: " + left);
+ System.out.println("right color: " + right);
+ System.out.println("bottom color: " + bottom);
+ System.out.println("top color: " + top);
+ System.out.println();
+
+ if (!(blue.equals(center) && blue.equals(left) && blue.equals(right) &&
+ blue.equals(top) && blue.equals(bottom))) {
+ throw new RuntimeException("Test failed: Image not scaled correctly");
+ }
+ });
+
+ r.waitForIdle();
+ }
+
+ public static void main(String[] args) throws Exception {
+
+ final String ABSOLUTE_FILE_PATH = ImageViewTest.class.getResource("circle.png").getPath();
+
+ System.out.println(ABSOLUTE_FILE_PATH);
+
+ Robot r = new Robot();
+
+ SwingUtilities.invokeAndWait(() -> {
+ editorPane1 = new JEditorPane("text/html",
+ "<img height=\"200\" src=\"file:///" + ABSOLUTE_FILE_PATH + "\"");
+
+ editorPane2 = new JEditorPane("text/html",
+ "<img width=\"200\" src=\"file:///" + ABSOLUTE_FILE_PATH + "\"");
+
+ editorPane3 = new JEditorPane("text/html",
+ "<img width=\"200\" height=\"200\" src=\"file:///" + ABSOLUTE_FILE_PATH + "\"");
+
+ editorPane4 = new JEditorPane("text/html",
+ "<img src=\"file:///" + ABSOLUTE_FILE_PATH + "\"");
+
+ });
+
+ r.waitForIdle();
+
+ System.out.println("Test with only height set to 200");
+ test(r, editorPane1);
+
+ System.out.println("Test with only width set to 200");
+ test(r, editorPane2);
+
+ System.out.println("Test with none of them set");
+ test(r, editorPane3);
+
+ System.out.println("Test with both of them set to 200");
+ test(r, editorPane4);
+
+ System.out.println("Test Passed.");
+ }
+}
Binary file test/jdk/javax/swing/JEditorPane/8195095/circle.png has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/javax/swing/JList/GetSelectedValueTest.java Thu Mar 15 11:36:11 2018 -0700
@@ -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 11:36:11 2018 -0700
@@ -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");
+ }
+ }
+}