< prev index next >

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

Print this page
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,166 **** installListeners(filechooser); filechooser.applyComponentOrientation(filechooser.getComponentOrientation()); } public void uninstallUI(JComponent c) { ! uninstallListeners((JFileChooser) filechooser); ! uninstallComponents((JFileChooser) filechooser); ! uninstallDefaults((JFileChooser) filechooser); if(accessoryPanel != null) { accessoryPanel.removeAll(); } --- 154,166 ---- installListeners(filechooser); filechooser.applyComponentOrientation(filechooser.getComponentOrientation()); } public void uninstallUI(JComponent c) { ! uninstallListeners(filechooser); ! uninstallComponents(filechooser); ! uninstallDefaults(filechooser); if(accessoryPanel != null) { accessoryPanel.removeAll(); }
*** 492,514 **** && 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]; 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()]); } setDirectorySelected(false); } } chooser.setSelectedFiles(files); --- 492,514 ---- && chooser.isTraversable(((File)objects[0])) && (useSetDirectory || !fsv.isFileSystem(((File)objects[0])))) { setDirectorySelected(true); setDirectory(((File)objects[0])); } else { ! 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 = fList.toArray(new File[fList.size()]); } setDirectorySelected(false); } } chooser.setSelectedFiles(files);
*** 830,840 **** filename = System.getProperty("user.home"); } } if (chooser.isMultiSelectionEnabled() && filename.startsWith("\"")) { ! ArrayList fList = new ArrayList(); filename = filename.substring(1); if (filename.endsWith("\"")) { filename = filename.substring(0, filename.length()-1); } --- 830,840 ---- filename = System.getProperty("user.home"); } } if (chooser.isMultiSelectionEnabled() && filename.startsWith("\"")) { ! ArrayList<File> fList = new ArrayList<File>(); filename = filename.substring(1); if (filename.endsWith("\"")) { filename = filename.substring(0, filename.length()-1); }
*** 866,876 **** } } fList.add(file); } while (filename.length() > 0); if (fList.size() > 0) { ! selectedFiles = (File[])fList.toArray(new File[fList.size()]); } resetGlobFilter(); } else { selectedFile = fs.createFileObject(filename); if(!selectedFile.isAbsolute()) { --- 866,876 ---- } } fList.add(file); } while (filename.length() > 0); if (fList.size() > 0) { ! selectedFiles = fList.toArray(new File[fList.size()]); } resetGlobFilter(); } else { selectedFile = fs.createFileObject(filename); if(!selectedFile.isAbsolute()) {
*** 1190,1200 **** } return type; } public Icon getCachedIcon(File f) { ! return (Icon) iconCache.get(f); } public void cacheIcon(File f, Icon i) { if(f == null || i == null) { return; --- 1190,1200 ---- } return type; } public Icon getCachedIcon(File f) { ! return iconCache.get(f); } public void cacheIcon(File f, Icon i) { if(f == null || i == null) { return;
*** 1273,1284 **** 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]; String val = ((obj == null) ? "" : obj.toString()); plainBuf.append(val + "\n"); htmlBuf.append(" <li>" + val + "\n"); } --- 1273,1283 ---- StringBuffer plainBuf = new StringBuffer(); StringBuffer htmlBuf = new StringBuffer(); htmlBuf.append("<html>\n<body>\n<ul>\n"); ! for (Object obj : values) { String val = ((obj == null) ? "" : obj.toString()); plainBuf.append(val + "\n"); htmlBuf.append(" <li>" + val + "\n"); }
*** 1314,1326 **** /** * 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]); } return files; } return null; } --- 1313,1325 ---- /** * The only richer format supported is the file list flavor */ protected Object getRicherData(DataFlavor flavor) { if (DataFlavor.javaFileListFlavor.equals(flavor)) { ! ArrayList<Object> files = new ArrayList<Object>(); ! for (Object file : this.fileData) { ! files.add(file); } return files; } return null; }
< prev index next >