src/share/classes/sun/awt/PlatformFont.java
Print this page
rev 9830 : 8039642: Fix raw and unchecked warnings in sun.awt.*
Reviewed-by: darcy, prr
@@ -141,11 +141,11 @@
boolean allowDefault) {
if (len < 1) {
return new CharsetString[0];
}
- Vector mcs = null;
+ Vector<CharsetString> mcs = null;
char[] tmpStr = new char[len];
char tmpChar = defaultChar;
boolean encoded = false;
FontDescriptor currentFont = defaultFont;
@@ -196,11 +196,11 @@
} else {
tmpStr[i] = tmpChar;
}
if (currentFont != fd){
if (mcs == null) {
- mcs = new Vector(3);
+ mcs = new Vector<>(3);
}
mcs.addElement(new CharsetString(tmpStr, lastIndex,
i-lastIndex, currentFont));
currentFont = fd;
fd = defaultFont;
@@ -213,14 +213,11 @@
if (mcs == null) {
result = new CharsetString[1];
result[0] = cs;
} else {
mcs.addElement(cs);
- result = new CharsetString[mcs.size()];
- for (int i = 0; i < mcs.size(); i++){
- result[i] = (CharsetString)mcs.elementAt(i);
- }
+ result = mcs.toArray(new CharsetString[mcs.size()]);
}
return result;
}
/**