OpenJDK / jdk8u / jdk8u / jdk
changeset 9782:8503e06e630b
8035699: File choosers should be choosier
Reviewed-by: alexsch, art, skoivu
| author | malenkov |
|---|---|
| date | Thu, 13 Mar 2014 14:23:21 +0400 |
| parents | 3a5462daa283 |
| children | b7dbcd0f7373 |
| files | src/share/classes/javax/swing/filechooser/FileSystemView.java src/windows/classes/sun/awt/shell/Win32ShellFolder2.java src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java |
| diffstat | 3 files changed, 20 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/javax/swing/filechooser/FileSystemView.java Fri Mar 07 10:15:36 2014 +0100 +++ b/src/share/classes/javax/swing/filechooser/FileSystemView.java Thu Mar 13 14:23:21 2014 +0400 @@ -718,7 +718,8 @@ * @return the Desktop folder. */ public File getHomeDirectory() { - return getRoots()[0]; + File[] roots = getRoots(); + return (roots.length == 0) ? null : roots[0]; } /**
--- a/src/windows/classes/sun/awt/shell/Win32ShellFolder2.java Fri Mar 07 10:15:36 2014 +0100 +++ b/src/windows/classes/sun/awt/shell/Win32ShellFolder2.java Thu Mar 13 14:23:21 2014 +0400 @@ -583,11 +583,18 @@ // Needs to be accessible to Win32ShellFolderManager2 static String getFileSystemPath(final int csidl) throws IOException, InterruptedException { - return invoke(new Callable<String>() { + String path = invoke(new Callable<String>() { public String call() throws IOException { return getFileSystemPath0(csidl); } }, IOException.class); + if (path != null) { + SecurityManager security = System.getSecurityManager(); + if (security != null) { + security.checkRead(path); + } + } + return path; } // NOTE: this method uses COM and must be called on the 'COM thread'. See ComInvoker for the details
--- a/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java Fri Mar 07 10:15:36 2014 +0100 +++ b/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java Thu Mar 13 14:23:21 2014 +0400 @@ -142,6 +142,8 @@ if (desktop == null) { try { desktop = new Win32ShellFolder2(DESKTOP); + } catch (SecurityException e) { + // Ignore error } catch (IOException e) { // Ignore error } catch (InterruptedException e) { @@ -155,6 +157,8 @@ if (drives == null) { try { drives = new Win32ShellFolder2(DRIVES); + } catch (SecurityException e) { + // Ignore error } catch (IOException e) { // Ignore error } catch (InterruptedException e) { @@ -171,6 +175,8 @@ if (path != null) { recent = createShellFolder(getDesktop(), new File(path)); } + } catch (SecurityException e) { + // Ignore error } catch (InterruptedException e) { // Ignore error } catch (IOException e) { @@ -184,6 +190,8 @@ if (network == null) { try { network = new Win32ShellFolder2(NETWORK); + } catch (SecurityException e) { + // Ignore error } catch (IOException e) { // Ignore error } catch (InterruptedException e) { @@ -207,6 +215,8 @@ personal.setIsPersonal(); } } + } catch (SecurityException e) { + // Ignore error } catch (InterruptedException e) { // Ignore error } catch (IOException e) {