stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6560349: REGRESSION :folder having ".lnk" in the name can not be opened by 5.0 and later versions

Browse Source 
Reviewed-by: alexp
This commit is contained in:
Pavel Porvatov 2008-11-26 19:08:41 +03:00
parent 466eda6ee4
commit e7c2dc0b7a
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jdk/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java
View File

@ -1134,11 +1134,16 @@ public class BasicFileChooserUI extends FileChooserUI {
// Traverse shortcuts on Windows // Traverse shortcuts on Windows
if (dir != null && FilePane.usesShellFolder(fc)) { if (dir != null && FilePane.usesShellFolder(fc)) {
try { try {
File linkedTo = ShellFolder.getShellFolder(dir).getLinkLocation(); ShellFolder shellFolder = ShellFolder.getShellFolder(dir);
if (linkedTo != null && fc.isTraversable(linkedTo)) {
dir = linkedTo; if (shellFolder.isLink()) {
} else { File linkedTo = shellFolder.getLinkLocation();
return;
if (linkedTo != null && fc.isTraversable(linkedTo)) {
dir = linkedTo;
} else {
return;
}
} }
} catch (FileNotFoundException ex) { } catch (FileNotFoundException ex) {
return; return;