changeset 5002:a3b50244bd10

7144475: fix some warnings in java.awt, javax.print.attribute.standard, and sun.beans.infos Reviewed-by: chegar, prr, alanb, anthony Contributed-by: Prasannaa <prasannaa_ss@yahoo.com>, Martijn Verburg <martijnverburg@gmail.com>, Goerge Albrecht <goerge.albrecht@gmx.net>, Graham Allan <grundlefleck@googlemail.com>, Iordanis Giannakakis <i.giannakakis@ymail.com>, Jose Llarena <jose.llarena@gmail.com>, Abrahamn Marin Perez <abraham.marin.perez@gmail.com>
author chegar
date Fri, 10 Feb 2012 11:03:20 +0000
parents 403e3bb8a162
children 55adee49df8e
files src/share/classes/java/awt/List.java src/share/classes/java/awt/Window.java src/share/classes/java/awt/color/ICC_Profile.java src/share/classes/javax/print/attribute/standard/PrinterStateReasons.java src/share/classes/javax/print/attribute/standard/ReferenceUriSchemesSupported.java src/share/classes/sun/beans/infos/ComponentBeanInfo.java
diffstat 6 files changed, 16 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/java/awt/List.java	Thu Feb 09 18:26:57 2012 +0400
+++ b/src/share/classes/java/awt/List.java	Fri Feb 10 11:03:20 2012 +0000
@@ -115,7 +115,7 @@
      * @see #addItem(String)
      * @see #getItem(int)
      */
-    Vector      items = new Vector();
+    Vector<String>      items = new Vector<>();
 
     /**
      * This field will represent the number of visible rows in the
@@ -306,7 +306,7 @@
     //       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 @@
         if (peer != null) {
             peer.removeAll();
         }
-        items = new Vector();
+        items = new Vector<>();
         selected = new int[0];
     }
 
@@ -490,9 +490,9 @@
     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 @@
      * @since 1.4
      */
     public synchronized ItemListener[] getItemListeners() {
-        return (ItemListener[])(getListeners(ItemListener.class));
+        return getListeners(ItemListener.class);
     }
 
     /**
@@ -975,7 +975,7 @@
      * @since 1.4
      */
     public synchronized ActionListener[] getActionListeners() {
-        return (ActionListener[])(getListeners(ActionListener.class));
+        return getListeners(ActionListener.class);
     }
 
     /**
--- a/src/share/classes/java/awt/Window.java	Thu Feb 09 18:26:57 2012 +0400
+++ b/src/share/classes/java/awt/Window.java	Fri Feb 10 11:03:20 2012 +0000
@@ -398,10 +398,10 @@
             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 @@
                 // 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"));
             }
--- a/src/share/classes/java/awt/color/ICC_Profile.java	Thu Feb 09 18:26:57 2012 +0400
+++ b/src/share/classes/java/awt/color/ICC_Profile.java	Fri Feb 10 11:03:20 2012 +0000
@@ -921,9 +921,9 @@
      */
     private static ICC_Profile getStandardProfile(final String name) {
 
-        return (ICC_Profile) AccessController.doPrivileged(
-            new PrivilegedAction() {
-                 public Object run() {
+        return AccessController.doPrivileged(
+            new PrivilegedAction<ICC_Profile>() {
+                 public ICC_Profile run() {
                      ICC_Profile p = null;
                      try {
                          p = getInstance (name);
--- a/src/share/classes/javax/print/attribute/standard/PrinterStateReasons.java	Thu Feb 09 18:26:57 2012 +0400
+++ b/src/share/classes/javax/print/attribute/standard/PrinterStateReasons.java	Fri Feb 10 11:03:20 2012 +0000
@@ -180,8 +180,7 @@
         if (severity == null) {
             throw new NullPointerException("severity is null");
         }
-        return super.put((PrinterStateReason) reason,
-                         (Severity) severity);
+        return super.put(reason, severity);
     }
 
     /**
--- a/src/share/classes/javax/print/attribute/standard/ReferenceUriSchemesSupported.java	Thu Feb 09 18:26:57 2012 +0400
+++ b/src/share/classes/javax/print/attribute/standard/ReferenceUriSchemesSupported.java	Fri Feb 10 11:03:20 2012 +0000
@@ -141,7 +141,7 @@
      * Returns the string table for class ReferenceUriSchemesSupported.
      */
     protected String[] getStringTable() {
-        return (String[])myStringTable.clone();
+        return myStringTable.clone();
     }
 
     /**
--- a/src/share/classes/sun/beans/infos/ComponentBeanInfo.java	Thu Feb 09 18:26:57 2012 +0400
+++ b/src/share/classes/sun/beans/infos/ComponentBeanInfo.java	Fri Feb 10 11:03:20 2012 +0000
@@ -32,7 +32,7 @@
  */
 
 public class ComponentBeanInfo extends SimpleBeanInfo {
-    private static final Class beanClass = java.awt.Component.class;
+    private static final Class<java.awt.Component> beanClass = java.awt.Component.class;
 
     public PropertyDescriptor[] getPropertyDescriptors() {
         try {