stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8047025: Fix raw and unchecked lint warnings in generated nimbus files

Browse Source 
Reviewed-by: henryjen, prr
This commit is contained in:
Stuart Marks 2014-07-08 09:19:29 -07:00
parent 021ffcfbdf
commit b8db13175e
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jdk/src/share/classes/javax/swing/plaf/nimbus/Defaults.template
View File

@ -398,7 +398,7 @@ ${UI_DEFAULT_INIT}
@Override @Override
public Object createValue(UIDefaults table) { public Object createValue(UIDefaults table) {
try { try {
Class c; Class<?> c;
Object cl; Object cl;
// See if we should use a separate ClassLoader // See if we should use a separate ClassLoader
if (table == null || !((cl = table.get("ClassLoader")) if (table == null || !((cl = table.get("ClassLoader"))
@ -412,7 +412,7 @@ ${UI_DEFAULT_INIT}
} }
c = Class.forName(className, true, (ClassLoader)cl); c = Class.forName(className, true, (ClassLoader)cl);
Constructor constructor = c.getConstructor( Constructor<?> constructor = c.getConstructor(
AbstractRegionPainter.PaintContext.class, int.class); AbstractRegionPainter.PaintContext.class, int.class);
if (constructor == null) { if (constructor == null) {
throw new NullPointerException( throw new NullPointerException(
@ -564,7 +564,7 @@ ${UI_DEFAULT_INIT}
//if c is not named, and parts[partIndex] has an expected class //if c is not named, and parts[partIndex] has an expected class
//type registered, then check to make sure c is of the //type registered, then check to make sure c is of the
//right type; //right type;
Class clazz = parts[partIndex].c; Class<?> clazz = parts[partIndex].c;
if (clazz != null && clazz.isAssignableFrom(c.getClass())) { if (clazz != null && clazz.isAssignableFrom(c.getClass())) {
//so far so good, recurse //so far so good, recurse
return matches(c.getParent(), partIndex - 1); return matches(c.getParent(), partIndex - 1);
@ -636,7 +636,7 @@ ${UI_DEFAULT_INIT}
private String s; private String s;
//true if this part represents a component name //true if this part represents a component name
private boolean named; private boolean named;
private Class c; private Class<?> c;
Part(String s) { Part(String s) {
named = s.charAt(0) == '"' && s.charAt(s.length() - 1) == '"'; named = s.charAt(0) == '"' && s.charAt(s.length() - 1) == '"';
@ -816,7 +816,7 @@ ${UI_DEFAULT_INIT}
private static final class PainterBorder implements Border, UIResource { private static final class PainterBorder implements Border, UIResource {
private Insets insets; private Insets insets;
private Painter painter; private Painter<Component> painter;
private String painterKey; private String painterKey;
PainterBorder(String painterKey, Insets insets) { PainterBorder(String painterKey, Insets insets) {
@ -827,7 +827,9 @@ ${UI_DEFAULT_INIT}
@Override @Override
public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) { public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) {
if (painter == null) { if (painter == null) {
painter = (Painter)UIManager.get(painterKey); @SuppressWarnings("unchecked")
Painter<Component> temp = (Painter<Component>)UIManager.get(painterKey);
painter = temp;
if (painter == null) return; if (painter == null) return;
} }

2
jdk/src/share/classes/javax/swing/plaf/nimbus/StateImpl.template
View File

@ -28,7 +28,7 @@ import java.awt.*;
import javax.swing.*; import javax.swing.*;
class ${STATE_NAME} extends State { class ${STATE_NAME} extends State<JComponent> {
${STATE_NAME}() { ${STATE_NAME}() {
super("${STATE_KEY}"); super("${STATE_KEY}");
} }