src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java

rev 1580 : 6727661: Code improvement and warnings removing from the swing/plaf packages
Summary: Removed unnecessary castings and other warnings
Reviewed-by: alexp
Contributed-by: Florian Brunner <fbrunnerlist@gmx.ch>

@@ -154,13 +154,13 @@
         installListeners(filechooser);
         filechooser.applyComponentOrientation(filechooser.getComponentOrientation());
     }
 
     public void uninstallUI(JComponent c) {
-        uninstallListeners((JFileChooser) filechooser);
-        uninstallComponents((JFileChooser) filechooser);
-        uninstallDefaults((JFileChooser) filechooser);
+        uninstallListeners(filechooser);
+        uninstallComponents(filechooser);
+        uninstallDefaults(filechooser);
 
         if(accessoryPanel != null) {
             accessoryPanel.removeAll();
         }
 

@@ -492,23 +492,23 @@
                             && chooser.isTraversable(((File)objects[0]))
                             && (useSetDirectory || !fsv.isFileSystem(((File)objects[0])))) {
                             setDirectorySelected(true);
                             setDirectory(((File)objects[0]));
                         } else {
-                            ArrayList fList = new ArrayList(objects.length);
-                            for (int i = 0; i < objects.length; i++) {
-                                File f = (File)objects[i];
+                            ArrayList<File> fList = new ArrayList<File>(objects.length);
+                            for (Object object : objects) {
+                                File f = (File) object;
                                 boolean isDir = f.isDirectory();
                                 if ((chooser.isFileSelectionEnabled() && !isDir)
                                     || (chooser.isDirectorySelectionEnabled()
                                         && fsv.isFileSystem(f)
                                         && isDir)) {
                                     fList.add(f);
                                 }
                             }
                             if (fList.size() > 0) {
-                                files = (File[])fList.toArray(new File[fList.size()]);
+                                files = fList.toArray(new File[fList.size()]);
                             }
                             setDirectorySelected(false);
                         }
                     }
                     chooser.setSelectedFiles(files);

@@ -830,11 +830,11 @@
                         filename = System.getProperty("user.home");
                     }
                 }
 
                 if (chooser.isMultiSelectionEnabled() && filename.startsWith("\"")) {
-                    ArrayList fList = new ArrayList();
+                    ArrayList<File> fList = new ArrayList<File>();
 
                     filename = filename.substring(1);
                     if (filename.endsWith("\"")) {
                         filename = filename.substring(0, filename.length()-1);
                     }

@@ -866,11 +866,11 @@
                             }
                         }
                         fList.add(file);
                     } while (filename.length() > 0);
                     if (fList.size() > 0) {
-                        selectedFiles = (File[])fList.toArray(new File[fList.size()]);
+                        selectedFiles = fList.toArray(new File[fList.size()]);
                     }
                     resetGlobFilter();
                 } else {
                     selectedFile = fs.createFileObject(filename);
                     if(!selectedFile.isAbsolute()) {

@@ -1190,11 +1190,11 @@
             }
             return type;
         }
 
         public Icon getCachedIcon(File f) {
-            return (Icon) iconCache.get(f);
+            return iconCache.get(f);
         }
 
         public void cacheIcon(File f, Icon i) {
             if(f == null || i == null) {
                 return;

@@ -1273,12 +1273,11 @@
             StringBuffer plainBuf = new StringBuffer();
             StringBuffer htmlBuf = new StringBuffer();
 
             htmlBuf.append("<html>\n<body>\n<ul>\n");
 
-            for (int i = 0; i < values.length; i++) {
-                Object obj = values[i];
+            for (Object obj : values) {
                 String val = ((obj == null) ? "" : obj.toString());
                 plainBuf.append(val + "\n");
                 htmlBuf.append("  <li>" + val + "\n");
             }
 

@@ -1314,13 +1313,13 @@
             /**
              * The only richer format supported is the file list flavor
              */
             protected Object getRicherData(DataFlavor flavor) {
                 if (DataFlavor.javaFileListFlavor.equals(flavor)) {
-                    ArrayList files = new ArrayList();
-                    for (int i = 0; i < fileData.length; i++) {
-                        files.add(fileData[i]);
+                    ArrayList<Object> files = new ArrayList<Object>();
+                    for (Object file : this.fileData) {
+                        files.add(file);
                     }
                     return files;
                 }
                 return null;
             }