--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java Fri Jul 25 14:14:30 2008 +0400
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java Fri Jul 25 17:50:36 2008 +0400
@@ -142,9 +142,9 @@
private Component visibleComponent;
// PENDING(api): See comment for ContainerHandler
- private Vector htmlViews;
-
- private Hashtable mnemonicToIndexMap;
+ private Vector<View> htmlViews;
+
+ private Hashtable<Integer, Integer> mnemonicToIndexMap;
/**
* InputMap used for mnemonics. Only non-null if the JTabbedPane has
@@ -546,7 +546,7 @@
* Installs the state needed for mnemonics.
*/
private void initMnemonics() {
- mnemonicToIndexMap = new Hashtable();
+ mnemonicToIndexMap = new Hashtable<Integer, Integer>();
mnemonicInputMap = new ComponentInputMapUIResource(tabPane);
mnemonicInputMap.setParent(SwingUtilities.getUIInputMap(tabPane,
JComponent.WHEN_IN_FOCUSED_WINDOW));
@@ -909,10 +909,10 @@
private static final int CROP_SEGMENT = 12;
private static Polygon createCroppedTabShape(int tabPlacement, Rectangle tabRect, int cropline) {
- int rlen = 0;
- int start = 0;
- int end = 0;
- int ostart = 0;
+ int rlen;
+ int start;
+ int end;
+ int ostart;
switch(tabPlacement) {
case LEFT:
@@ -1014,7 +1014,7 @@
tabPane.putClientProperty("html", v);
}
- SwingUtilities.layoutCompoundLabel((JComponent) tabPane,
+ SwingUtilities.layoutCompoundLabel(tabPane,
metrics, title, icon,
SwingUtilities.CENTER,
SwingUtilities.CENTER,
@@ -1694,7 +1694,7 @@
*/
protected View getTextViewForTab(int tabIndex) {
if (htmlViews != null) {
- return (View)htmlViews.elementAt(tabIndex);
+ return htmlViews.elementAt(tabIndex);
}
return null;
}
@@ -2230,8 +2230,7 @@
if (mnemonic >= 'a' && mnemonic <='z') {
mnemonic -= ('a' - 'A');
}
- Integer index = (Integer)ui.mnemonicToIndexMap.
- get(Integer.valueOf(mnemonic));
+ Integer index = ui.mnemonicToIndexMap.get(Integer.valueOf(mnemonic));
if (index != null && pane.isEnabledAt(index.intValue())) {
pane.setSelectedIndex(index.intValue());
}
@@ -2292,8 +2291,7 @@
for (int i = 0; i < tabPane.getTabCount(); i++) {
Component component = tabPane.getComponentAt(i);
if (component != null) {
- Dimension size = zeroSize;
- size = minimum? component.getMinimumSize() :
+ Dimension size = minimum ? component.getMinimumSize() :
component.getPreferredSize();
if (size != null) {
@@ -2305,7 +2303,7 @@
// Add content border insets to minimum size
width += cWidth;
height += cHeight;
- int tabExtent = 0;
+ int tabExtent;
// Calculate how much space the tabs will need, based on the
// minimum size required to display largest child + content border
@@ -3143,7 +3141,7 @@
Insets tabAreaInsets = getTabAreaInsets(tabPlacement);
int fontHeight = metrics.getHeight();
int selectedIndex = tabPane.getSelectedIndex();
- int i, j;
+ int i;
boolean verticalTabRuns = (tabPlacement == LEFT || tabPlacement == RIGHT);
boolean leftToRight = BasicGraphicsUtils.isLeftToRight(tabPane);
int x = tabAreaInsets.left;
@@ -3433,10 +3431,10 @@
}
public String toString() {
- return new String("viewport.viewSize="+viewport.getViewSize()+"\n"+
+ return "viewport.viewSize=" + viewport.getViewSize() + "\n" +
"viewport.viewRectangle="+viewport.getViewRect()+"\n"+
"leadingTabIndex="+leadingTabIndex+"\n"+
- "tabViewPosition="+tabViewPosition);
+ "tabViewPosition=" + tabViewPosition;
}
}
@@ -3788,8 +3786,8 @@
}
}
- private Vector createHTMLVector() {
- Vector htmlViews = new Vector();
+ private Vector<View> createHTMLVector() {
+ Vector<View> htmlViews = new Vector<View>();
int count = tabPane.getTabCount();
if (count>0) {
for (int i=0 ; i<count; i++) {