提交 9db90d88 编写于 作者: V vadim

8001173: [findbugs] Evaluate FindBug output for sun.font.CompositeFont,...

8001173: [findbugs] Evaluate FindBug output for sun.font.CompositeFont, sun.font.CompositeFontDescriptor
Reviewed-by: prr, bae
上级 84e5f9de
...@@ -97,7 +97,7 @@ public class StandardTextSource extends TextSource { ...@@ -97,7 +97,7 @@ public class StandardTextSource extends TextSource {
throw new IllegalArgumentException("bad frc: null"); throw new IllegalArgumentException("bad frc: null");
} }
this.chars = chars; this.chars = chars.clone();
this.start = start; this.start = start;
this.len = len; this.len = len;
this.cstart = cstart; this.cstart = cstart;
...@@ -148,7 +148,7 @@ public class StandardTextSource extends TextSource { ...@@ -148,7 +148,7 @@ public class StandardTextSource extends TextSource {
// TextSource API // TextSource API
public char[] getChars() { public char[] getChars() {
return chars; return chars.clone();
} }
public int getStart() { public int getStart() {
......
...@@ -32,7 +32,6 @@ package sun.font; ...@@ -32,7 +32,6 @@ package sun.font;
import java.awt.Font; import java.awt.Font;
import java.awt.font.FontRenderContext; import java.awt.font.FontRenderContext;
import java.awt.font.LineMetrics;
import java.text.Bidi; import java.text.Bidi;
/** /**
...@@ -70,7 +69,7 @@ public class TextLabelFactory { ...@@ -70,7 +69,7 @@ public class TextLabelFactory {
Bidi bidi, Bidi bidi,
int flags) { int flags) {
this.frc = frc; this.frc = frc;
this.text = text; this.text = text.clone();
this.bidi = bidi; this.bidi = bidi;
this.flags = flags; this.flags = flags;
this.lineBidi = bidi; this.lineBidi = bidi;
...@@ -82,30 +81,10 @@ public class TextLabelFactory { ...@@ -82,30 +81,10 @@ public class TextLabelFactory {
return frc; return frc;
} }
public char[] getText() {
return text;
}
public Bidi getParagraphBidi() {
return bidi;
}
public Bidi getLineBidi() { public Bidi getLineBidi() {
return lineBidi; return lineBidi;
} }
public int getLayoutFlags() {
return flags;
}
public int getLineStart() {
return lineStart;
}
public int getLineLimit() {
return lineLimit;
}
/** /**
* Set a line context for the factory. Shaping only occurs on this line. * Set a line context for the factory. Shaping only occurs on this line.
* Characters are ordered as they would appear on this line. * Characters are ordered as they would appear on this line.
......
...@@ -108,10 +108,6 @@ public class FontConfigManager { ...@@ -108,10 +108,6 @@ public class FontConfigManager {
public FontConfigManager() { public FontConfigManager() {
} }
public static String[] getFontConfigNames() {
return fontConfigNames;
}
/* Called from code that needs to know what are the AA settings /* Called from code that needs to know what are the AA settings
* that apps using FC would pick up for the default desktop font. * that apps using FC would pick up for the default desktop font.
* Note apps can change the default desktop font. etc, so this * Note apps can change the default desktop font. etc, so this
...@@ -182,7 +178,6 @@ public class FontConfigManager { ...@@ -182,7 +178,6 @@ public class FontConfigManager {
t0 = System.nanoTime(); t0 = System.nanoTime();
} }
String[] fontConfigNames = FontConfigManager.getFontConfigNames();
FcCompFont[] fontArr = new FcCompFont[fontConfigNames.length]; FcCompFont[] fontArr = new FcCompFont[fontConfigNames.length];
for (int i = 0; i< fontArr.length; i++) { for (int i = 0; i< fontArr.length; i++) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册