--- old/src/java.desktop/share/classes/javax/swing/DefaultComboBoxModel.java 2018-04-09 16:54:25.760794100 +0530 +++ new/src/java.desktop/share/classes/javax/swing/DefaultComboBoxModel.java 2018-04-09 16:54:22.682552600 +0530 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 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 @@ -24,8 +24,8 @@ */ package javax.swing; -import java.util.*; - +import java.util.Collection; +import java.util.Vector; import java.io.Serializable; /** @@ -177,4 +177,47 @@ selectedObject = null; } } + + /** + * Adds all of the elements present in the collection. + *

+ * + * @param c the collection which contains the elements to add. + */ + public void addElements(Collection c) { + if (c.isEmpty()) { + return; + } + + int startIndex = getSize(); + + objects.addAll(c); + fireIntervalAdded(this, startIndex, getSize() - 1); + } + + /** + * Add all of the elements present in the collection, starting + * from the index specified. + *

+ * Throws an IllegalArgumentException + * if the index was invalid. + * + * @param index the index from which to start adding elements from. + * @param c the collection which contains the elements to add + * @exception IllegalArgumentException if c doesn't fall + * in the range of the list. + */ + public void addElementsAt(int index, Collection c) { + if (index < 0 || index > getSize()) { + throw new IllegalArgumentException( + "index must be >=0 and <= number of elements in the combobox."); + } + + if (c.isEmpty()) { + return; + } + + objects.addAll(index, c); + fireIntervalAdded(this, index, index + c.size() - 1); + } } --- old/src/java.desktop/share/classes/javax/swing/DefaultListModel.java 2018-04-09 16:54:41.431753000 +0530 +++ new/src/java.desktop/share/classes/javax/swing/DefaultListModel.java 2018-04-09 16:54:39.093491700 +0530 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -26,10 +26,9 @@ package javax.swing; import java.util.Vector; +import java.util.Collection; import java.util.Enumeration; -import javax.swing.event.*; - /** * This class loosely implements the java.util.Vector @@ -539,11 +538,44 @@ fireIntervalRemoved(this, fromIndex, toIndex); } - /* - public void addAll(Collection c) { + /** + * Adds all of the elements present in the collection to the list. + * + * @param c the collection which contains the elements to add. + */ + public void addAll(Collection c) { + if (c.isEmpty()) { + return; + } + + int startIndex = getSize(); + + delegate.addAll(c); + fireIntervalAdded(this, startIndex, getSize() - 1); } - public void addAll(int index, Collection c) { + /** + * Adds all of the elements present in the collection, starting + * from the index specified. + *

+ * Throws as IllegalArgumentException if the + * index is invalid. + * + * @param index the index from which to start adding elements from. + * @param c the collection which contains the elements to add + * @exception IllegalArgumentException if c doesn't + * fall in the rang of the list. + */ + public void addAll(int index, Collection c) { + if (index < 0 || index > getSize()) { + throw new IllegalArgumentException( + "index number must be >=0 and <= number of elements in the list."); + } + if (c.isEmpty()) { + return; + } + + delegate.addAll(index, c); + fireIntervalAdded(this, index, index + c.size() - 1); } - */ } --- /dev/null 2018-04-09 16:54:56.000000000 +0530 +++ new/test/jdk/javax/swing/JComboBox/DefaultComboBoxModelAddAllElementsTest.java 2018-04-09 16:54:53.038829400 +0530 @@ -0,0 +1,116 @@ +/* + * 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 + * @bug 4842658 + * @summary Tests the addAllElements, addAllElementsAt methods of DefaultComboBoxModel. + * @run main DefaultComboBoxModelAddAllElementsTest + */ +import javax.swing.DefaultComboBoxModel; +import javax.swing.event.ListDataEvent; +import javax.swing.event.ListDataListener; +import java.util.ArrayList; +import java.util.TreeSet; +import java.util.Vector; +import java.util.stream.IntStream; + + +public class DefaultComboBoxModelAddAllElementsTest { + private static final int START = 0; + private static final int END = 50; + private static final Vector vector = + IntStream.range(START, END).collect(Vector::new, + Vector::add, + Vector::addAll); + + private static final TreeSet set = + IntStream.range(START, END).collect(TreeSet::new, + TreeSet::add, + TreeSet::addAll); + + private static final ArrayList arrayList = + IntStream.range(START, END).collect(ArrayList::new, + ArrayList::add, + ArrayList::addAll); + + public static void main(String[] args) { + checkAddAll(); + checkAddAllWithIndex(); + System.out.println("Test case passed."); + } + + private static class MyListDataListener implements ListDataListener { + @Override public void intervalAdded(ListDataEvent e) { + if (e.getIndex1() - e.getIndex0() != END - START) { + throw new RuntimeException("Test case failed. Expected " + (END - START) + + " elements to be added, but only got " + (e.getIndex1() - e.getIndex0())); + } + } + + @Override public void intervalRemoved(ListDataEvent e) {} + @Override public void contentsChanged(ListDataEvent e) {} + } + + private static void checkAddAll() { + DefaultComboBoxModel lm = new DefaultComboBoxModel<>(); + lm.addListDataListener(new MyListDataListener()); + + try { + lm.addElements(arrayList); + System.out.println("Successfully added " + (END - START) + "elements."); + } catch (Exception e) { + throw new RuntimeException("Test case failed. " + e.getMessage()); + } + } + + private static void checkAddAllWithIndex() { + DefaultComboBoxModel cm = new DefaultComboBoxModel<>(); + + cm.addListDataListener(new MyListDataListener()); + cm.addElements(set); + + try { + cm.addElementsAt(START - 1, vector); + throw new RuntimeException("Test case failed. Expected failure not reported."); + } catch (IllegalArgumentException e){ + System.out.println("Encountered exception as expected, when trying to add elements" + + "before the start of the list."); + } + + try { + cm.addElementsAt(15, vector); + System.out.println("Successfully added elements at a particular index"); + } catch (Exception e) { + throw new RuntimeException("Unexpected failure: " + e.getMessage()); + } + + try { + cm.addElementsAt(END + END + 1, vector); + throw new RuntimeException("Test case failed. Expected failure not reported."); + } catch (IllegalArgumentException e){ + System.out.println("Encountered exception as expected, when trying to add elements" + + "after the end of the list."); + } + } +} --- /dev/null 2018-04-09 16:55:09.000000000 +0530 +++ new/test/jdk/javax/swing/JList/DefaultListModelAddAllTest.java 2018-04-09 16:55:04.430124100 +0530 @@ -0,0 +1,116 @@ +/* + * 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 + * @bug 4842658 + * @summary Tests the addAll methods of DefaultListModel. + * @run main DefaultListModelAddAllTest + */ + +import javax.swing.DefaultListModel; +import javax.swing.event.ListDataEvent; +import javax.swing.event.ListDataListener; +import java.util.ArrayList; +import java.util.TreeSet; +import java.util.Vector; +import java.util.stream.IntStream; + +public class DefaultListModelAddAllTest { + private static final int START = 0; + private static final int END = 50; + private static final Vector vector = + IntStream.range(START, END).collect(Vector::new, + Vector::add, + Vector::addAll); + + private static final TreeSet set = + IntStream.range(START, END).collect(TreeSet::new, + TreeSet::add, + TreeSet::addAll); + + private static final ArrayList arrayList = + IntStream.range(START, END).collect(ArrayList::new, + ArrayList::add, + ArrayList::addAll); + + public static void main(String[] args) { + checkAddAll(); + checkAddAllWithIndex(); + System.out.println("Test case passed."); + } + + private static class MyListDataListener implements ListDataListener { + @Override public void intervalAdded(ListDataEvent e) { + if (e.getIndex1() - e.getIndex0() != END - START - 1) { + throw new RuntimeException("Test case failed. Expected " + (END - START) + + " elements to be added, but only got " + (e.getIndex1() - e.getIndex0())); + } + } + + @Override public void intervalRemoved(ListDataEvent e) {} + @Override public void contentsChanged(ListDataEvent e) {} + } + + private static void checkAddAll() { + DefaultListModel lm = new DefaultListModel<>(); + lm.addListDataListener(new MyListDataListener()); + + try { + lm.addAll(arrayList); + System.out.println("Successfully added " + (END - START) + "elements."); + } catch (Exception e) { + throw new RuntimeException("Test case failed. " + e.getMessage()); + } + } + + private static void checkAddAllWithIndex() { + DefaultListModel lm = new DefaultListModel<>(); + + lm.addListDataListener(new MyListDataListener()); + lm.addAll(set); + + try { + lm.addAll(START - 1, vector); + throw new RuntimeException("Test case failed. Expected failure not reported."); + } catch (IllegalArgumentException e){ + System.out.println("Encountered exception as expected, when trying to add elements" + + "before the start of the list."); + } + + try { + lm.addAll(15, vector); + System.out.println("Successfully added elements at a particular index"); + } catch (Exception e) { + throw new RuntimeException("Unexpected failure: " + e.getMessage()); + } + + try { + lm.addAll(END + END + 1, vector); + throw new RuntimeException("Test case failed. Expected failure not reported."); + } catch (IllegalArgumentException e){ + System.out.println("Encountered exception as expected, when trying to add elements" + + "after the end of the list."); + } + } +}