From 3d4c6a66f2521f9b43d58b7602610d85586aaae2 Mon Sep 17 00:00:00 2001 From: chegar Date: Fri, 10 Feb 2012 11:03:20 +0000 Subject: [PATCH] 7144475: fix some warnings in java.awt, javax.print.attribute.standard, and sun.beans.infos Reviewed-by: chegar, prr, alanb, anthony Contributed-by: Prasannaa , Martijn Verburg , Goerge Albrecht , Graham Allan , Iordanis Giannakakis , Jose Llarena , Abrahamn Marin Perez --- src/share/classes/java/awt/List.java | 14 +++++++------- src/share/classes/java/awt/Window.java | 6 +++--- src/share/classes/java/awt/color/ICC_Profile.java | 6 +++--- .../attribute/standard/PrinterStateReasons.java | 3 +-- .../standard/ReferenceUriSchemesSupported.java | 2 +- .../classes/sun/beans/infos/ComponentBeanInfo.java | 2 +- 6 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/share/classes/java/awt/List.java b/src/share/classes/java/awt/List.java index 917977b15..d5b60ae56 100644 --- a/src/share/classes/java/awt/List.java +++ b/src/share/classes/java/awt/List.java @@ -115,7 +115,7 @@ public class List extends Component implements ItemSelectable, Accessible { * @see #addItem(String) * @see #getItem(int) */ - Vector items = new Vector(); + Vector items = new Vector<>(); /** * This field will represent the number of visible rows in the @@ -306,7 +306,7 @@ public class List extends Component implements ItemSelectable, Accessible { // to insure that it cannot be overridden by client subclasses. // DO NOT INVOKE CLIENT CODE ON THIS THREAD! final String getItemImpl(int index) { - return (String)items.elementAt(index); + return items.elementAt(index); } /** @@ -415,7 +415,7 @@ public class List extends Component implements ItemSelectable, Accessible { if (peer != null) { peer.removeAll(); } - items = new Vector(); + items = new Vector<>(); selected = new int[0]; } @@ -490,9 +490,9 @@ public class List extends Component implements ItemSelectable, Accessible { public synchronized int[] getSelectedIndexes() { ListPeer peer = (ListPeer)this.peer; if (peer != null) { - selected = ((ListPeer)peer).getSelectedIndexes(); + selected = peer.getSelectedIndexes(); } - return (int[])selected.clone(); + return selected.clone(); } /** @@ -908,7 +908,7 @@ public class List extends Component implements ItemSelectable, Accessible { * @since 1.4 */ public synchronized ItemListener[] getItemListeners() { - return (ItemListener[])(getListeners(ItemListener.class)); + return getListeners(ItemListener.class); } /** @@ -975,7 +975,7 @@ public class List extends Component implements ItemSelectable, Accessible { * @since 1.4 */ public synchronized ActionListener[] getActionListeners() { - return (ActionListener[])(getListeners(ActionListener.class)); + return getListeners(ActionListener.class); } /** diff --git a/src/share/classes/java/awt/Window.java b/src/share/classes/java/awt/Window.java index d2c97dbf8..646d9ded8 100644 --- a/src/share/classes/java/awt/Window.java +++ b/src/share/classes/java/awt/Window.java @@ -398,10 +398,10 @@ public class Window extends Container implements Accessible { initIDs(); } - String s = (String) java.security.AccessController.doPrivileged( + String s = java.security.AccessController.doPrivileged( new GetPropertyAction("java.awt.syncLWRequests")); systemSyncLWRequests = (s != null && s.equals("true")); - s = (String) java.security.AccessController.doPrivileged( + s = java.security.AccessController.doPrivileged( new GetPropertyAction("java.awt.Window.locationByPlatform")); locationByPlatformProp = (s != null && s.equals("true")); } @@ -1378,7 +1378,7 @@ public class Window extends Container implements Accessible { // make sure the privileged action is only // for getting the property! We don't want the // above checkTopLevelWindow call to always succeed! - warningString = (String) AccessController.doPrivileged( + warningString = AccessController.doPrivileged( new GetPropertyAction("awt.appletWarning", "Java Applet Window")); } diff --git a/src/share/classes/java/awt/color/ICC_Profile.java b/src/share/classes/java/awt/color/ICC_Profile.java index 81212fbfe..c06ddf61c 100644 --- a/src/share/classes/java/awt/color/ICC_Profile.java +++ b/src/share/classes/java/awt/color/ICC_Profile.java @@ -921,9 +921,9 @@ public class ICC_Profile implements Serializable { */ private static ICC_Profile getStandardProfile(final String name) { - return (ICC_Profile) AccessController.doPrivileged( - new PrivilegedAction() { - public Object run() { + return AccessController.doPrivileged( + new PrivilegedAction() { + public ICC_Profile run() { ICC_Profile p = null; try { p = getInstance (name); diff --git a/src/share/classes/javax/print/attribute/standard/PrinterStateReasons.java b/src/share/classes/javax/print/attribute/standard/PrinterStateReasons.java index f49210d08..339be3621 100644 --- a/src/share/classes/javax/print/attribute/standard/PrinterStateReasons.java +++ b/src/share/classes/javax/print/attribute/standard/PrinterStateReasons.java @@ -180,8 +180,7 @@ public final class PrinterStateReasons if (severity == null) { throw new NullPointerException("severity is null"); } - return super.put((PrinterStateReason) reason, - (Severity) severity); + return super.put(reason, severity); } /** diff --git a/src/share/classes/javax/print/attribute/standard/ReferenceUriSchemesSupported.java b/src/share/classes/javax/print/attribute/standard/ReferenceUriSchemesSupported.java index 70d09510d..b52b2abbc 100644 --- a/src/share/classes/javax/print/attribute/standard/ReferenceUriSchemesSupported.java +++ b/src/share/classes/javax/print/attribute/standard/ReferenceUriSchemesSupported.java @@ -141,7 +141,7 @@ public class ReferenceUriSchemesSupported * Returns the string table for class ReferenceUriSchemesSupported. */ protected String[] getStringTable() { - return (String[])myStringTable.clone(); + return myStringTable.clone(); } /** diff --git a/src/share/classes/sun/beans/infos/ComponentBeanInfo.java b/src/share/classes/sun/beans/infos/ComponentBeanInfo.java index e16511f98..ae6631f1f 100644 --- a/src/share/classes/sun/beans/infos/ComponentBeanInfo.java +++ b/src/share/classes/sun/beans/infos/ComponentBeanInfo.java @@ -32,7 +32,7 @@ import java.beans.*; */ public class ComponentBeanInfo extends SimpleBeanInfo { - private static final Class beanClass = java.awt.Component.class; + private static final Class beanClass = java.awt.Component.class; public PropertyDescriptor[] getPropertyDescriptors() { try { -- GitLab