diff options
author | alexsch <none@none> | 2014-09-11 13:25:44 +0400 |
---|---|---|
committer | alexsch <none@none> | 2014-09-11 13:25:44 +0400 |
commit | a937a071e90fa6b5fe515b748cb0a047f449ccb9 (patch) | |
tree | ec86e27e11879b46c61d6a2d838aad10b3cde08f /src/share/classes/javax | |
parent | ad05ce1c0502bbb3bccc0760009fa7703bc18873 (diff) |
8055304: More boxing for DirectoryComboBoxModel
Reviewed-by: serb, prr, skoivu
Diffstat (limited to 'src/share/classes/javax')
-rw-r--r-- | src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java b/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java index 677d1f88c..ddc70c91c 100644 --- a/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java +++ b/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java @@ -941,16 +941,9 @@ public class MetalFileChooserUI extends BasicFileChooserUI { directories.clear(); - File[] baseFolders; - if (useShellFolder) { - baseFolders = AccessController.doPrivileged(new PrivilegedAction<File[]>() { - public File[] run() { - return (File[]) ShellFolder.get("fileChooserComboBoxFolders"); - } - }); - } else { - baseFolders = fsv.getRoots(); - } + File[] baseFolders = (useShellFolder) + ? (File[]) ShellFolder.get("fileChooserComboBoxFolders") + : fsv.getRoots(); directories.addAll(Arrays.asList(baseFolders)); // Get the canonical (full) path. This has the side |