--- old/src/share/classes/javax/swing/plaf/multi/MultiListUI.java 2014-06-14 12:28:47.000000000 -0700
+++ new/src/share/classes/javax/swing/plaf/multi/MultiListUI.java 2014-06-14 12:28:47.000000000 -0700
@@ -50,7 +50,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 int locationToIndex(JList a, Point b) {
+ public int locationToIndex(JList> a, Point b) {
int returnValue =
((ListUI) (uis.elementAt(0))).locationToIndex(a,b);
for (int i = 1; i < uis.size(); i++) {
@@ -90,7 +90,7 @@
* @return the value obtained from the first UI, which is
* the UI obtained from the default LookAndFeel
*/
- public Point indexToLocation(JList a, int b) {
+ public Point indexToLocation(JList> a, int b) {
Point returnValue =
((ListUI) (uis.elementAt(0))).indexToLocation(a,b);
for (int i = 1; i < uis.size(); i++) {
@@ -105,7 +105,7 @@
* @return the value obtained from the first UI, which is
* the UI obtained from the default LookAndFeel
*/
- public Rectangle getCellBounds(JList a, int b, int c) {
+ public Rectangle getCellBounds(JList> a, int b, int c) {
Rectangle returnValue =
((ListUI) (uis.elementAt(0))).getCellBounds(a,b,c);
for (int i = 1; i < uis.size(); i++) {
@@ -126,9 +126,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;
}
@@ -138,7 +138,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);
}
}
@@ -148,10 +148,8 @@
* UI object obtained from the default LookAndFeel
.
*/
public static ComponentUI createUI(JComponent a) {
- ComponentUI mui = new MultiListUI();
- return MultiLookAndFeel.createUIs(mui,
- ((MultiListUI) mui).uis,
- a);
+ MultiListUI mui = new MultiListUI();
+ return MultiLookAndFeel.createUIs(mui, mui.uis, a);
}
/**
@@ -159,7 +157,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);
}
}
@@ -168,7 +166,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);
}
}
@@ -177,7 +175,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);
}
}
@@ -189,9 +187,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;
}
@@ -204,9 +202,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;
}
@@ -219,9 +217,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;
}
@@ -234,9 +232,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;
}
@@ -249,9 +247,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;
}