diff --git a/src/share/classes/javax/swing/ComboBoxModel.java b/src/share/classes/javax/swing/ComboBoxModel.java index 78ac525ec7dbc8df6abd9f151647d20daa1f3015..4b657daf88135732789aed26dc8eb47b8e2ed30b 100644 --- a/src/share/classes/javax/swing/ComboBoxModel.java +++ b/src/share/classes/javax/swing/ComboBoxModel.java @@ -33,9 +33,11 @@ package javax.swing; * ListModel. This disjoint behavior allows for the temporary * storage and retrieval of a selected item in the model. * + * @param the type of the elements of this model + * * @author Arnaud Weber */ -public interface ComboBoxModel extends ListModel { +public interface ComboBoxModel extends ListModel { /** * Set the selected item. The implementation of this method should notify diff --git a/src/share/classes/javax/swing/DefaultComboBoxModel.java b/src/share/classes/javax/swing/DefaultComboBoxModel.java index f7cc50b1a7078353c83313560000d462e9b5e762..f0266fc73511f1edfdcb234a4af96a47ea696e60 100644 --- a/src/share/classes/javax/swing/DefaultComboBoxModel.java +++ b/src/share/classes/javax/swing/DefaultComboBoxModel.java @@ -24,39 +24,28 @@ */ package javax.swing; -import java.beans.*; import java.util.*; -import java.awt.*; -import java.awt.event.*; - import java.io.Serializable; -import java.io.ObjectOutputStream; -import java.io.ObjectInputStream; -import java.io.IOException; - -import javax.swing.event.*; -import javax.swing.plaf.*; -import javax.swing.border.*; - -import javax.accessibility.*; /** * The default model for combo boxes. * + * @param the type of the elements of this model + * * @author Arnaud Weber * @author Tom Santos */ -public class DefaultComboBoxModel extends AbstractListModel implements MutableComboBoxModel, Serializable { - Vector objects; +public class DefaultComboBoxModel extends AbstractListModel implements MutableComboBoxModel, Serializable { + Vector objects; Object selectedObject; /** * Constructs an empty DefaultComboBoxModel object. */ public DefaultComboBoxModel() { - objects = new Vector(); + objects = new Vector(); } /** @@ -65,8 +54,8 @@ public class DefaultComboBoxModel extends AbstractListModel implements MutableCo * * @param items an array of Object objects */ - public DefaultComboBoxModel(final Object items[]) { - objects = new Vector(); + public DefaultComboBoxModel(final E items[]) { + objects = new Vector(); objects.ensureCapacity( items.length ); int i,c; @@ -84,7 +73,7 @@ public class DefaultComboBoxModel extends AbstractListModel implements MutableCo * * @param v a Vector object ... */ - public DefaultComboBoxModel(Vector v) { + public DefaultComboBoxModel(Vector v) { objects = v; if ( getSize() > 0 ) { @@ -117,7 +106,7 @@ public class DefaultComboBoxModel extends AbstractListModel implements MutableCo } // implements javax.swing.ListModel - public Object getElementAt(int index) { + public E getElementAt(int index) { if ( index >= 0 && index < objects.size() ) return objects.elementAt(index); else @@ -136,7 +125,7 @@ public class DefaultComboBoxModel extends AbstractListModel implements MutableCo } // implements javax.swing.MutableComboBoxModel - public void addElement(Object anObject) { + public void addElement(E anObject) { objects.addElement(anObject); fireIntervalAdded(this,objects.size()-1, objects.size()-1); if ( objects.size() == 1 && selectedObject == null && anObject != null ) { @@ -145,7 +134,7 @@ public class DefaultComboBoxModel extends AbstractListModel implements MutableCo } // implements javax.swing.MutableComboBoxModel - public void insertElementAt(Object anObject,int index) { + public void insertElementAt(E anObject,int index) { objects.insertElementAt(anObject,index); fireIntervalAdded(this, index, index); } diff --git a/src/share/classes/javax/swing/JComboBox.java b/src/share/classes/javax/swing/JComboBox.java index b4a414bbf1aa29374263999cec935c0b62fd1fb7..8ac710910a84ead4e0e1007e23a9eb05de2515c2 100644 --- a/src/share/classes/javax/swing/JComboBox.java +++ b/src/share/classes/javax/swing/JComboBox.java @@ -69,6 +69,8 @@ import javax.accessibility.*; * @see ComboBoxModel * @see DefaultComboBoxModel * + * @param the type of the elements of this combo box + * * @beaninfo * attribute: isContainer false * description: A combination of a text field and a drop-down list. @@ -76,7 +78,7 @@ import javax.accessibility.*; * @author Arnaud Weber * @author Mark Davidson */ -public class JComboBox extends JComponent +public class JComboBox extends JComponent implements ItemSelectable,ListDataListener,ActionListener, Accessible { /** * @see #getUIClassID @@ -91,7 +93,7 @@ implements ItemSelectable,ListDataListener,ActionListener, Accessible { * @see #getModel * @see #setModel */ - protected ComboBoxModel dataModel; + protected ComboBoxModel dataModel; /** * This protected field is implementation specific. Do not access directly * or override. Use the accessor methods instead. @@ -99,7 +101,7 @@ implements ItemSelectable,ListDataListener,ActionListener, Accessible { * @see #getRenderer * @see #setRenderer */ - protected ListCellRenderer renderer; + protected ListCellRenderer renderer; /** * This protected field is implementation specific. Do not access directly * or override. Use the accessor methods instead. @@ -156,7 +158,7 @@ implements ItemSelectable,ListDataListener,ActionListener, Accessible { */ protected Object selectedItemReminder = null; - private Object prototypeDisplayValue; + private E prototypeDisplayValue; // Flag to ensure that infinite loops do not occur with ActionEvents. private boolean firingActionEvent = false; @@ -175,7 +177,7 @@ implements ItemSelectable,ListDataListener,ActionListener, Accessible { * displayed list of items * @see DefaultComboBoxModel */ - public JComboBox(ComboBoxModel aModel) { + public JComboBox(ComboBoxModel aModel) { super(); setModel(aModel); init(); @@ -189,9 +191,9 @@ implements ItemSelectable,ListDataListener,ActionListener, Accessible { * @param items an array of objects to insert into the combo box * @see DefaultComboBoxModel */ - public JComboBox(final Object items[]) { + public JComboBox(E[] items) { super(); - setModel(new DefaultComboBoxModel(items)); + setModel(new DefaultComboBoxModel(items)); init(); } @@ -203,9 +205,9 @@ implements ItemSelectable,ListDataListener,ActionListener, Accessible { * @param items an array of vectors to insert into the combo box * @see DefaultComboBoxModel */ - public JComboBox(Vector items) { + public JComboBox(Vector items) { super(); - setModel(new DefaultComboBoxModel(items)); + setModel(new DefaultComboBoxModel(items)); init(); } @@ -219,7 +221,7 @@ implements ItemSelectable,ListDataListener,ActionListener, Accessible { */ public JComboBox() { super(); - setModel(new DefaultComboBoxModel()); + setModel(new DefaultComboBoxModel()); init(); } @@ -263,7 +265,7 @@ implements ItemSelectable,ListDataListener,ActionListener, Accessible { public void updateUI() { setUI((ComboBoxUI)UIManager.getUI(this)); - ListCellRenderer renderer = getRenderer(); + ListCellRenderer renderer = getRenderer(); if (renderer instanceof Component) { SwingUtilities.updateComponentTreeUI((Component)renderer); } @@ -302,8 +304,8 @@ implements ItemSelectable,ListDataListener,ActionListener, Accessible { * bound: true * description: Model that the combo box uses to get data to display. */ - public void setModel(ComboBoxModel aModel) { - ComboBoxModel oldModel = dataModel; + public void setModel(ComboBoxModel aModel) { + ComboBoxModel oldModel = dataModel; if (oldModel != null) { oldModel.removeListDataListener(this); } @@ -322,7 +324,7 @@ implements ItemSelectable,ListDataListener,ActionListener, Accessible { * @return the ComboBoxModel that provides the displayed * list of items */ - public ComboBoxModel getModel() { + public ComboBoxModel getModel() { return dataModel; } @@ -461,8 +463,8 @@ implements ItemSelectable,ListDataListener,ActionListener, Accessible { * expert: true * description: The renderer that paints the item selected in the list. */ - public void setRenderer(ListCellRenderer aRenderer) { - ListCellRenderer oldRenderer = renderer; + public void setRenderer(ListCellRenderer aRenderer) { + ListCellRenderer oldRenderer = renderer; renderer = aRenderer; firePropertyChange( "renderer", oldRenderer, renderer ); invalidate(); @@ -475,7 +477,7 @@ implements ItemSelectable,ListDataListener,ActionListener, Accessible { * @return the ListCellRenderer that displays * the selected item. */ - public ListCellRenderer getRenderer() { + public ListCellRenderer getRenderer() { return renderer; } @@ -558,7 +560,7 @@ implements ItemSelectable,ListDataListener,ActionListener, Accessible { // will be rejected. boolean found = false; for (int i = 0; i < dataModel.getSize(); i++) { - Object element = dataModel.getElementAt(i); + E element = dataModel.getElementAt(i); if (anObject.equals(element)) { found = true; objectToSelect = element; @@ -640,7 +642,7 @@ implements ItemSelectable,ListDataListener,ActionListener, Accessible { public int getSelectedIndex() { Object sObject = dataModel.getSelectedItem(); int i,c; - Object obj; + E obj; for ( i=0,c=dataModel.getSize();i * - * @param anObject the Object to add to the list + * @param item the item to add to the list * @see MutableComboBoxModel */ - public void addItem(Object anObject) { + public void addItem(E item) { checkMutableComboBoxModel(); - ((MutableComboBoxModel)dataModel).addElement(anObject); + ((MutableComboBoxModel)dataModel).addElement(item); } /** @@ -721,14 +723,14 @@ implements ItemSelectable,ListDataListener,ActionListener, Accessible { * This method works only if the JComboBox uses a * mutable data model. * - * @param anObject the Object to add to the list + * @param item the item to add to the list * @param index an integer specifying the position at which * to add the item * @see MutableComboBoxModel */ - public void insertItemAt(Object anObject, int index) { + public void insertItemAt(E item, int index) { checkMutableComboBoxModel(); - ((MutableComboBoxModel)dataModel).insertElementAt(anObject,index); + ((MutableComboBoxModel)dataModel).insertElementAt(item,index); } /** @@ -756,7 +758,7 @@ implements ItemSelectable,ListDataListener,ActionListener, Accessible { */ public void removeItemAt(int anIndex) { checkMutableComboBoxModel(); - ((MutableComboBoxModel)dataModel).removeElementAt( anIndex ); + ((MutableComboBoxModel)dataModel).removeElementAt( anIndex ); } /** @@ -764,7 +766,7 @@ implements ItemSelectable,ListDataListener,ActionListener, Accessible { */ public void removeAllItems() { checkMutableComboBoxModel(); - MutableComboBoxModel model = (MutableComboBoxModel)dataModel; + MutableComboBoxModel model = (MutableComboBoxModel)dataModel; int size = model.getSize(); if ( model instanceof DefaultComboBoxModel ) { @@ -772,7 +774,7 @@ implements ItemSelectable,ListDataListener,ActionListener, Accessible { } else { for ( int i = 0; i < size; ++i ) { - Object element = model.getElementAt( 0 ); + E element = model.getElementAt( 0 ); model.removeElement( element ); } } @@ -1188,11 +1190,11 @@ implements ItemSelectable,ListDataListener,ActionListener, Accessible { private static class ComboBoxActionPropertyChangeListener - extends ActionPropertyChangeListener { - ComboBoxActionPropertyChangeListener(JComboBox b, Action a) { + extends ActionPropertyChangeListener> { + ComboBoxActionPropertyChangeListener(JComboBox b, Action a) { super(b, a); } - protected void actionPropertyChanged(JComboBox cb, + protected void actionPropertyChanged(JComboBox cb, Action action, PropertyChangeEvent e) { if (AbstractAction.shouldReconfigure(e)) { @@ -1454,10 +1456,10 @@ implements ItemSelectable,ListDataListener,ActionListener, Accessible { * * @param index an integer indicating the list position, where the first * item starts at zero - * @return the Object at that list position; or + * @return the item at that list position; or * null if out of range */ - public Object getItemAt(int index) { + public E getItemAt(int index) { return dataModel.getElementAt(index); } diff --git a/src/share/classes/javax/swing/MutableComboBoxModel.java b/src/share/classes/javax/swing/MutableComboBoxModel.java index 03b75631af93c3548e9cdf68f7c5469968e125b8..90f9474a7ea95b3fcb1b537a120899a8ba5bb74e 100644 --- a/src/share/classes/javax/swing/MutableComboBoxModel.java +++ b/src/share/classes/javax/swing/MutableComboBoxModel.java @@ -27,19 +27,21 @@ package javax.swing; /** * A mutable version of ComboBoxModel. * + * @param the type of the elements of this model + * * @author Tom Santos */ -public interface MutableComboBoxModel extends ComboBoxModel { +public interface MutableComboBoxModel extends ComboBoxModel { /** * Adds an item at the end of the model. The implementation of this method * should notify all registered ListDataListeners that the * item has been added. * - * @param obj the Object to be added + * @param item the item to be added */ - public void addElement( Object obj ); + public void addElement( E item ); /** * Removes an item from the model. The implementation of this method should @@ -55,17 +57,17 @@ public interface MutableComboBoxModel extends ComboBoxModel { * should notify all registered ListDataListeners that the * item has been added. * - * @param obj the Object to be added + * @param item the item to be added * @param index location to add the object */ - public void insertElementAt( Object obj, int index ); + public void insertElementAt( E item, int index ); /** * Removes an item at a specific index. The implementation of this method * should notify all registered ListDataListeners that the * item has been removed. * - * @param index location of object to be removed + * @param index location of the item to be removed */ public void removeElementAt( int index ); } diff --git a/src/share/classes/javax/swing/plaf/basic/BasicDirectoryModel.java b/src/share/classes/javax/swing/plaf/basic/BasicDirectoryModel.java index f34b8d1684c7c87547da66ee868c4f2519da5399..23252d77a581e073d02e7b2fb3e95ba16d8500cf 100644 --- a/src/share/classes/javax/swing/plaf/basic/BasicDirectoryModel.java +++ b/src/share/classes/javax/swing/plaf/basic/BasicDirectoryModel.java @@ -40,7 +40,7 @@ import sun.awt.shell.ShellFolder; * * @author Jeff Dinkins */ -public class BasicDirectoryModel extends AbstractListModel implements PropertyChangeListener { +public class BasicDirectoryModel extends AbstractListModel implements PropertyChangeListener { private JFileChooser filechooser = null; // PENDING(jeff) pick the size more sensibly diff --git a/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java b/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java index e36a849dce4cf43311501e63205e6e20c90b6105..b3d38477bee511662be623ed47cc1dbcff95b779 100644 --- a/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java +++ b/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java @@ -906,7 +906,7 @@ public class MetalFileChooserUI extends BasicFileChooserUI { /** * Data model for a type-face selection combo-box. */ - protected class DirectoryComboBoxModel extends AbstractListModel implements ComboBoxModel { + protected class DirectoryComboBoxModel extends AbstractListModel implements ComboBoxModel { Vector directories = new Vector(); int[] depths = null; File selectedDirectory = null; @@ -1063,7 +1063,7 @@ public class MetalFileChooserUI extends BasicFileChooserUI { /** * Data model for a type-face selection combo-box. */ - protected class FilterComboBoxModel extends AbstractListModel implements ComboBoxModel, PropertyChangeListener { + protected class FilterComboBoxModel extends AbstractListModel implements ComboBoxModel, PropertyChangeListener { protected FileFilter[] filters; protected FilterComboBoxModel() { super(); diff --git a/src/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java b/src/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java index 84a773ab300bdd74c1574616b61588f6fd0429b6..0686967412d6c8b60cae2856292d5fdd615659a3 100644 --- a/src/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java +++ b/src/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java @@ -488,6 +488,18 @@ public class SynthTabbedPaneUI extends BasicTabbedPaneUI paintContentBorder(tabContentContext, g, tabPlacement, selectedIndex); } + protected void paintTabArea(Graphics g, int tabPlacement, + int selectedIndex) { + // This can be invoked from ScrollabeTabPanel + Insets insets = tabPane.getInsets(); + int x = insets.left; + int y = insets.top; + int width = tabPane.getWidth() - insets.left - insets.right; + int height = tabPane.getHeight() - insets.top - insets.bottom; + + paintTabArea(tabAreaContext, g, tabPlacement, selectedIndex, + new Rectangle(x, y, width, height)); + } private void paintTabArea(SynthContext ss, Graphics g, int tabPlacement, int selectedIndex, diff --git a/src/share/classes/sun/text/bidi/BidiBase.java b/src/share/classes/sun/text/bidi/BidiBase.java index 8be648e931c794fc49bc0f9925030b1dbb69f407..8983ab6a668f0308ce714a8ca505be21024195be 100644 --- a/src/share/classes/sun/text/bidi/BidiBase.java +++ b/src/share/classes/sun/text/bidi/BidiBase.java @@ -2889,10 +2889,6 @@ public class BidiBase { verifyValidPara(); verifyRange(start, 0, limit); verifyRange(limit, 0, length+1); - if (getParagraphIndex(start) != getParagraphIndex(limit - 1)) { - /* the line crosses a paragraph boundary */ - throw new IllegalArgumentException(); - } return BidiLine.setLine(bidi, this, newBidi, newBidiBase, start, limit); } diff --git a/test/java/text/Bidi/Bug7041232.java b/test/java/text/Bidi/Bug7041232.java new file mode 100644 index 0000000000000000000000000000000000000000..f8e84e293c476b1a24b16092b63967cc9acb28b9 --- /dev/null +++ b/test/java/text/Bidi/Bug7041232.java @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2011, 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 7041232 + * @summary verify that an unexpected exception isn't thrown for unnatural data to keep backward compatibility with JDK 6. + */ +import java.text.*; + +public class Bug7041232 { + + public static void main(String[] args) { + String UnicodeChars; + StringBuffer sb = new StringBuffer(); + + // Generates String which includes U+2028(line separator) and + // U+2029(paragraph separator) + for (int i = 0x2000; i < 0x2100; i++) { + sb.append((char)i); + } + UnicodeChars = sb.toString(); + + Bidi bidi = new Bidi(UnicodeChars, Bidi.DIRECTION_DEFAULT_LEFT_TO_RIGHT); + bidi.createLineBidi(0, UnicodeChars.length()); + } + +} diff --git a/test/javax/swing/JComboBox/7031551/bug7031551.java b/test/javax/swing/JComboBox/7031551/bug7031551.java new file mode 100644 index 0000000000000000000000000000000000000000..e246805c628218d72c4ba1e02021f2076b60166c --- /dev/null +++ b/test/javax/swing/JComboBox/7031551/bug7031551.java @@ -0,0 +1,123 @@ +/* + * Copyright (c) 2011, 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 7031551 + * @summary Generics: JComboBox + * @author Pavel Porvatov + */ + +import javax.swing.*; +import java.util.Vector; + +public class bug7031551 { + + private static final String TEST_ELEMENT1 = "Test1"; + private static final String TEST_ELEMENT2 = "Test2"; + private static final String TEST_ELEMENT3 = "Test3"; + + /** + * @param args the command line arguments + */ + @SuppressWarnings("unchecked") + public static void main(String[] args) { + testRawSignatures(); + testGenericSignatures(); + } + + @SuppressWarnings("unchecked") + private static void testRawSignatures() { + // Test JComboBox + ComboBoxModel rawTestModel = new DefaultComboBoxModel(); + + JComboBox rawTestComboBox = new JComboBox(); + rawTestComboBox = new JComboBox(rawTestModel); + rawTestComboBox = new JComboBox(new Object[]{TEST_ELEMENT1}); + rawTestComboBox = new JComboBox(new Vector()); + + Object unused1 = rawTestComboBox.getPrototypeDisplayValue(); + rawTestComboBox.setPrototypeDisplayValue(TEST_ELEMENT1); + + ListCellRenderer unused2 = rawTestComboBox.getRenderer(); + rawTestComboBox.setRenderer(new DefaultListCellRenderer()); + + ComboBoxModel unused3 = rawTestComboBox.getModel(); + rawTestComboBox.setModel(rawTestModel); + + rawTestComboBox.addItem(TEST_ELEMENT2); + rawTestComboBox.insertItemAt(TEST_ELEMENT3, 1); + rawTestComboBox.removeItem(TEST_ELEMENT2); + assertEquals(rawTestComboBox.getItemAt(0), TEST_ELEMENT3); + rawTestComboBox.removeAllItems(); + + // Test DefaultComboBoxModel + DefaultComboBoxModel testModel = new DefaultComboBoxModel(); + testModel = new DefaultComboBoxModel(new Vector()); + testModel = new DefaultComboBoxModel(new Object[]{TEST_ELEMENT1}); + + testModel.addElement(TEST_ELEMENT2); + testModel.insertElementAt(TEST_ELEMENT3, 1); + assertEquals(testModel.getElementAt(2), TEST_ELEMENT2); + } + + private static void testGenericSignatures() { + // Test JComboBox + ComboBoxModel stringTestModel = new DefaultComboBoxModel(); + + JComboBox stringTestComboBox = new JComboBox(); + stringTestComboBox = new JComboBox(stringTestModel); + stringTestComboBox = new JComboBox(new String[]{TEST_ELEMENT1}); + stringTestComboBox = new JComboBox(new Vector()); + + String unused1 = stringTestComboBox.getPrototypeDisplayValue(); + stringTestComboBox.setPrototypeDisplayValue(TEST_ELEMENT1); + + ListCellRenderer unused2 = stringTestComboBox.getRenderer(); + stringTestComboBox.setRenderer(new DefaultListCellRenderer()); + + ComboBoxModel unused3 = stringTestComboBox.getModel(); + stringTestComboBox.setModel(stringTestModel); + + stringTestComboBox.addItem(TEST_ELEMENT2); + stringTestComboBox.insertItemAt(TEST_ELEMENT3, 1); + stringTestComboBox.removeItem(TEST_ELEMENT2); + assertEquals(stringTestComboBox.getItemAt(0), TEST_ELEMENT3); + stringTestComboBox.removeAllItems(); + + // Test DefaultComboBoxModel + DefaultComboBoxModel testModel = new DefaultComboBoxModel(); + testModel = new DefaultComboBoxModel(new Vector()); + testModel = new DefaultComboBoxModel(new String[]{TEST_ELEMENT1}); + + testModel.addElement(TEST_ELEMENT2); + testModel.insertElementAt(TEST_ELEMENT3, 1); + assertEquals(testModel.getElementAt(2), TEST_ELEMENT2); + } + + private static void assertEquals(Object expectedObject, Object actualObject) { + if (!expectedObject.equals(actualObject)) { + throw new RuntimeException("Expected: " + expectedObject + " but was: " + actualObject); + } + } +} + diff --git a/test/javax/swing/JTable/6788484/bug6788484.java b/test/javax/swing/JTable/6788484/bug6788484.java index ded6f1fb72e115030160e30d00e62f2771061960..392bc945042dac109d19c73e49f09256e2fd0bae 100644 --- a/test/javax/swing/JTable/6788484/bug6788484.java +++ b/test/javax/swing/JTable/6788484/bug6788484.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2011 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,9 +24,17 @@ /* @test @bug 6788484 @summary NPE in DefaultTableCellHeaderRenderer.getColumnSortOrder() with null table + @compile -XDignore.symbol.file=true bug6788484.java @author Alexander Potochkin @run main bug6788484 */ + +/* + * Compile with -XDignore.symbol.file=true option as a workaround for + * specific behaviour described in 6380059 which restricts proprietary + * package loading + */ + import sun.swing.table.DefaultTableCellHeaderRenderer; import javax.swing.*;