--- old/src/share/classes/javax/swing/plaf/multi/MultiComboBoxUI.java 2014-06-26 12:32:41.000000000 -0700 +++ new/src/share/classes/javax/swing/plaf/multi/MultiComboBoxUI.java 2014-06-26 12:32:40.000000000 -0700 @@ -48,7 +48,7 @@ * the getUIs method. The first element is guaranteed to be the real UI * obtained from the default look and feel. */ - protected Vector uis = new Vector(); + protected Vector uis = new Vector<>(); //////////////////// // Common UI methods @@ -75,7 +75,7 @@ * @return the value obtained from the first UI, which is * the UI obtained from the default LookAndFeel */ - public boolean isFocusTraversable(JComboBox a) { + public boolean isFocusTraversable(JComboBox a) { boolean returnValue = ((ComboBoxUI) (uis.elementAt(0))).isFocusTraversable(a); for (int i = 1; i < uis.size(); i++) { @@ -87,7 +87,7 @@ /** * Invokes the setPopupVisible method on each UI handled by this object. */ - public void setPopupVisible(JComboBox a, boolean b) { + public void setPopupVisible(JComboBox a, boolean b) { for (int i = 0; i < uis.size(); i++) { ((ComboBoxUI) (uis.elementAt(i))).setPopupVisible(a,b); } @@ -99,7 +99,7 @@ * @return the value obtained from the first UI, which is * the UI obtained from the default LookAndFeel */ - public boolean isPopupVisible(JComboBox a) { + public boolean isPopupVisible(JComboBox a) { boolean returnValue = ((ComboBoxUI) (uis.elementAt(0))).isPopupVisible(a); for (int i = 1; i < uis.size(); i++) { @@ -120,9 +120,9 @@ */ public boolean contains(JComponent a, int b, int c) { boolean returnValue = - ((ComponentUI) (uis.elementAt(0))).contains(a,b,c); + uis.elementAt(0).contains(a,b,c); for (int i = 1; i < uis.size(); i++) { - ((ComponentUI) (uis.elementAt(i))).contains(a,b,c); + uis.elementAt(i).contains(a,b,c); } return returnValue; } @@ -132,7 +132,7 @@ */ public void update(Graphics a, JComponent b) { for (int i = 0; i < uis.size(); i++) { - ((ComponentUI) (uis.elementAt(i))).update(a,b); + uis.elementAt(i).update(a,b); } } @@ -145,10 +145,8 @@ * @return the UI delegate created */ public static ComponentUI createUI(JComponent a) { - ComponentUI mui = new MultiComboBoxUI(); - return MultiLookAndFeel.createUIs(mui, - ((MultiComboBoxUI) mui).uis, - a); + MultiComboBoxUI mui = new MultiComboBoxUI(); + return MultiLookAndFeel.createUIs(mui, mui.uis, a); } /** @@ -156,7 +154,7 @@ */ public void installUI(JComponent a) { for (int i = 0; i < uis.size(); i++) { - ((ComponentUI) (uis.elementAt(i))).installUI(a); + uis.elementAt(i).installUI(a); } } @@ -165,7 +163,7 @@ */ public void uninstallUI(JComponent a) { for (int i = 0; i < uis.size(); i++) { - ((ComponentUI) (uis.elementAt(i))).uninstallUI(a); + uis.elementAt(i).uninstallUI(a); } } @@ -174,7 +172,7 @@ */ public void paint(Graphics a, JComponent b) { for (int i = 0; i < uis.size(); i++) { - ((ComponentUI) (uis.elementAt(i))).paint(a,b); + uis.elementAt(i).paint(a,b); } } @@ -186,9 +184,9 @@ */ public Dimension getPreferredSize(JComponent a) { Dimension returnValue = - ((ComponentUI) (uis.elementAt(0))).getPreferredSize(a); + uis.elementAt(0).getPreferredSize(a); for (int i = 1; i < uis.size(); i++) { - ((ComponentUI) (uis.elementAt(i))).getPreferredSize(a); + uis.elementAt(i).getPreferredSize(a); } return returnValue; } @@ -201,9 +199,9 @@ */ public Dimension getMinimumSize(JComponent a) { Dimension returnValue = - ((ComponentUI) (uis.elementAt(0))).getMinimumSize(a); + uis.elementAt(0).getMinimumSize(a); for (int i = 1; i < uis.size(); i++) { - ((ComponentUI) (uis.elementAt(i))).getMinimumSize(a); + uis.elementAt(i).getMinimumSize(a); } return returnValue; } @@ -216,9 +214,9 @@ */ public Dimension getMaximumSize(JComponent a) { Dimension returnValue = - ((ComponentUI) (uis.elementAt(0))).getMaximumSize(a); + uis.elementAt(0).getMaximumSize(a); for (int i = 1; i < uis.size(); i++) { - ((ComponentUI) (uis.elementAt(i))).getMaximumSize(a); + uis.elementAt(i).getMaximumSize(a); } return returnValue; } @@ -231,9 +229,9 @@ */ public int getAccessibleChildrenCount(JComponent a) { int returnValue = - ((ComponentUI) (uis.elementAt(0))).getAccessibleChildrenCount(a); + uis.elementAt(0).getAccessibleChildrenCount(a); for (int i = 1; i < uis.size(); i++) { - ((ComponentUI) (uis.elementAt(i))).getAccessibleChildrenCount(a); + uis.elementAt(i).getAccessibleChildrenCount(a); } return returnValue; } @@ -246,9 +244,9 @@ */ public Accessible getAccessibleChild(JComponent a, int b) { Accessible returnValue = - ((ComponentUI) (uis.elementAt(0))).getAccessibleChild(a,b); + uis.elementAt(0).getAccessibleChild(a,b); for (int i = 1; i < uis.size(); i++) { - ((ComponentUI) (uis.elementAt(i))).getAccessibleChild(a,b); + uis.elementAt(i).getAccessibleChild(a,b); } return returnValue; }