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,151 ****
boolean allowDefault) {
if (len < 1) {
return new CharsetString[0];
}
! Vector mcs = null;
char[] tmpStr = new char[len];
char tmpChar = defaultChar;
boolean encoded = false;
FontDescriptor currentFont = defaultFont;
--- 141,151 ----
boolean allowDefault) {
if (len < 1) {
return new CharsetString[0];
}
! Vector<CharsetString> mcs = null;
char[] tmpStr = new char[len];
char tmpChar = defaultChar;
boolean encoded = false;
FontDescriptor currentFont = defaultFont;
*** 196,206 ****
} else {
tmpStr[i] = tmpChar;
}
if (currentFont != fd){
if (mcs == null) {
! mcs = new Vector(3);
}
mcs.addElement(new CharsetString(tmpStr, lastIndex,
i-lastIndex, currentFont));
currentFont = fd;
fd = defaultFont;
--- 196,206 ----
} else {
tmpStr[i] = tmpChar;
}
if (currentFont != fd){
if (mcs == null) {
! mcs = new Vector<>(3);
}
mcs.addElement(new CharsetString(tmpStr, lastIndex,
i-lastIndex, currentFont));
currentFont = fd;
fd = defaultFont;
*** 213,226 ****
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);
! }
}
return result;
}
/**
--- 213,223 ----
if (mcs == null) {
result = new CharsetString[1];
result[0] = cs;
} else {
mcs.addElement(cs);
! result = mcs.toArray(new CharsetString[mcs.size()]);
}
return result;
}
/**