author | pkbalakr |
Wed, 30 Aug 2017 16:56:59 +0530 | |
changeset 47190 | 8aff50fc76a5 |
parent 39515 | 5f9e9e8bf57b |
permissions | -rw-r--r-- |
2 | 1 |
/* |
31430
66b012d00bd3
8017487: filechooser in Windows-Libraries folder: columns are mixed up
ssadetsky
parents:
29922
diff
changeset
|
2 |
* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. |
2 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
5506 | 7 |
* published by the Free Software Foundation. Oracle designates this |
2 | 8 |
* particular file as subject to the "Classpath" exception as provided |
5506 | 9 |
* by Oracle in the LICENSE file that accompanied this code. |
2 | 10 |
* |
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
15 |
* accompanied this code). |
|
16 |
* |
|
17 |
* You should have received a copy of the GNU General Public License version |
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
20 |
* |
|
5506 | 21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
22 |
* or visit www.oracle.com if you need additional information or have any |
|
23 |
* questions. |
|
2 | 24 |
*/ |
25 |
||
26 |
package sun.awt.shell; |
|
27 |
||
3978
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
28 |
import java.awt.*; |
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
29 |
import java.awt.image.BufferedImage; |
39515
5f9e9e8bf57b
8151385: [hidpi] JOptionPane-Icons only partially visible when using Windows 10 L&F
hschreiber
parents:
37550
diff
changeset
|
30 |
import java.awt.image.BaseMultiResolutionImage; |
2 | 31 |
|
32 |
import java.io.File; |
|
33 |
import java.io.FileNotFoundException; |
|
34 |
import java.io.IOException; |
|
35 |
import java.security.AccessController; |
|
2489
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
36 |
import java.security.PrivilegedAction; |
2 | 37 |
import java.util.*; |
3978
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
38 |
import java.util.List; |
2489
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
39 |
import java.util.concurrent.*; |
28546 | 40 |
import java.util.stream.Stream; |
2489
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
41 |
|
2 | 42 |
import static sun.awt.shell.Win32ShellFolder2.*; |
43 |
import sun.awt.OSInfo; |
|
24520
e8afd90fcb69
8035169: Move ThreadGroupUtils from the sun.misc package
pchelko
parents:
23900
diff
changeset
|
44 |
import sun.awt.util.ThreadGroupUtils; |
2 | 45 |
// NOTE: This class supersedes Win32ShellFolderManager, which was removed |
46 |
// from distribution after version 1.4.2. |
|
47 |
||
48 |
/** |
|
49 |
* @author Michael Martak |
|
50 |
* @author Leif Samuelsson |
|
51 |
* @author Kenneth Russell |
|
52 |
* @since 1.4 |
|
53 |
*/ |
|
54 |
||
25209
e9902dc8b9a0
8042094: Test javax/swing/JFileChooser/7036025/bug7036025.java fails with java.lang.NullPointerException on Windows x86
azvegint
parents:
25192
diff
changeset
|
55 |
final class Win32ShellFolderManager2 extends ShellFolderManager { |
2 | 56 |
|
57 |
static { |
|
58 |
// Load library here |
|
23691
475a42c428e0
8035171: KSS: sun.awt.shell.Win32ShellFolderManager2
malenkov
parents:
23010
diff
changeset
|
59 |
sun.awt.windows.WToolkit.loadLibraries(); |
2 | 60 |
} |
61 |
||
62 |
public ShellFolder createShellFolder(File file) throws FileNotFoundException { |
|
3346
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
63 |
try { |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
64 |
return createShellFolder(getDesktop(), file); |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
65 |
} catch (InterruptedException e) { |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
66 |
throw new FileNotFoundException("Execution was interrupted"); |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
67 |
} |
2 | 68 |
} |
69 |
||
3346
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
70 |
static Win32ShellFolder2 createShellFolder(Win32ShellFolder2 parent, File file) |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
71 |
throws FileNotFoundException, InterruptedException { |
2 | 72 |
long pIDL; |
73 |
try { |
|
74 |
pIDL = parent.parseDisplayName(file.getCanonicalPath()); |
|
75 |
} catch (IOException ex) { |
|
76 |
pIDL = 0; |
|
77 |
} |
|
78 |
if (pIDL == 0) { |
|
79 |
// Shouldn't happen but watch for it anyway |
|
80 |
throw new FileNotFoundException("File " + file.getAbsolutePath() + " not found"); |
|
81 |
} |
|
4275
4c3444f1b9d8
6621569: Win32ShellFolder2 and Win32ShellFolderManager2 may leak native resources
rupashka
parents:
4271
diff
changeset
|
82 |
|
4c3444f1b9d8
6621569: Win32ShellFolder2 and Win32ShellFolderManager2 may leak native resources
rupashka
parents:
4271
diff
changeset
|
83 |
try { |
4c3444f1b9d8
6621569: Win32ShellFolder2 and Win32ShellFolderManager2 may leak native resources
rupashka
parents:
4271
diff
changeset
|
84 |
return createShellFolderFromRelativePIDL(parent, pIDL); |
4c3444f1b9d8
6621569: Win32ShellFolder2 and Win32ShellFolderManager2 may leak native resources
rupashka
parents:
4271
diff
changeset
|
85 |
} finally { |
4c3444f1b9d8
6621569: Win32ShellFolder2 and Win32ShellFolderManager2 may leak native resources
rupashka
parents:
4271
diff
changeset
|
86 |
Win32ShellFolder2.releasePIDL(pIDL); |
4c3444f1b9d8
6621569: Win32ShellFolder2 and Win32ShellFolderManager2 may leak native resources
rupashka
parents:
4271
diff
changeset
|
87 |
} |
2 | 88 |
} |
89 |
||
3346
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
90 |
static Win32ShellFolder2 createShellFolderFromRelativePIDL(Win32ShellFolder2 parent, long pIDL) |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
91 |
throws InterruptedException { |
2 | 92 |
// Walk down this relative pIDL, creating new nodes for each of the entries |
93 |
while (pIDL != 0) { |
|
94 |
long curPIDL = Win32ShellFolder2.copyFirstPIDLEntry(pIDL); |
|
95 |
if (curPIDL != 0) { |
|
31430
66b012d00bd3
8017487: filechooser in Windows-Libraries folder: columns are mixed up
ssadetsky
parents:
29922
diff
changeset
|
96 |
parent = Win32ShellFolder2.createShellFolder(parent, curPIDL); |
2 | 97 |
pIDL = Win32ShellFolder2.getNextPIDLEntry(pIDL); |
98 |
} else { |
|
99 |
// The list is empty if the parent is Desktop and pIDL is a shortcut to Desktop |
|
100 |
break; |
|
101 |
} |
|
102 |
} |
|
103 |
return parent; |
|
104 |
} |
|
105 |
||
3978
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
106 |
private static final int VIEW_LIST = 2; |
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
107 |
private static final int VIEW_DETAILS = 3; |
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
108 |
private static final int VIEW_PARENTFOLDER = 8; |
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
109 |
private static final int VIEW_NEWFOLDER = 11; |
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
110 |
|
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
111 |
private static final Image[] STANDARD_VIEW_BUTTONS = new Image[12]; |
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
112 |
|
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
113 |
private static Image getStandardViewButton(int iconIndex) { |
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
114 |
Image result = STANDARD_VIEW_BUTTONS[iconIndex]; |
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
115 |
|
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
116 |
if (result != null) { |
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
117 |
return result; |
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
118 |
} |
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
119 |
|
39515
5f9e9e8bf57b
8151385: [hidpi] JOptionPane-Icons only partially visible when using Windows 10 L&F
hschreiber
parents:
37550
diff
changeset
|
120 |
final int[] iconBits = Win32ShellFolder2 |
5f9e9e8bf57b
8151385: [hidpi] JOptionPane-Icons only partially visible when using Windows 10 L&F
hschreiber
parents:
37550
diff
changeset
|
121 |
.getStandardViewButton0(iconIndex, true); |
5f9e9e8bf57b
8151385: [hidpi] JOptionPane-Icons only partially visible when using Windows 10 L&F
hschreiber
parents:
37550
diff
changeset
|
122 |
if (iconBits != null) { |
5f9e9e8bf57b
8151385: [hidpi] JOptionPane-Icons only partially visible when using Windows 10 L&F
hschreiber
parents:
37550
diff
changeset
|
123 |
// icons are always square |
5f9e9e8bf57b
8151385: [hidpi] JOptionPane-Icons only partially visible when using Windows 10 L&F
hschreiber
parents:
37550
diff
changeset
|
124 |
final int size = (int) Math.sqrt(iconBits.length); |
5f9e9e8bf57b
8151385: [hidpi] JOptionPane-Icons only partially visible when using Windows 10 L&F
hschreiber
parents:
37550
diff
changeset
|
125 |
final BufferedImage img = |
5f9e9e8bf57b
8151385: [hidpi] JOptionPane-Icons only partially visible when using Windows 10 L&F
hschreiber
parents:
37550
diff
changeset
|
126 |
new BufferedImage(size, size, BufferedImage.TYPE_INT_ARGB); |
5f9e9e8bf57b
8151385: [hidpi] JOptionPane-Icons only partially visible when using Windows 10 L&F
hschreiber
parents:
37550
diff
changeset
|
127 |
img.setRGB(0, 0, size, size, iconBits, 0, size); |
3978
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
128 |
|
39515
5f9e9e8bf57b
8151385: [hidpi] JOptionPane-Icons only partially visible when using Windows 10 L&F
hschreiber
parents:
37550
diff
changeset
|
129 |
STANDARD_VIEW_BUTTONS[iconIndex] = (size == 16) |
5f9e9e8bf57b
8151385: [hidpi] JOptionPane-Icons only partially visible when using Windows 10 L&F
hschreiber
parents:
37550
diff
changeset
|
130 |
? img |
5f9e9e8bf57b
8151385: [hidpi] JOptionPane-Icons only partially visible when using Windows 10 L&F
hschreiber
parents:
37550
diff
changeset
|
131 |
: new MultiResolutionIconImage(16, img); |
5f9e9e8bf57b
8151385: [hidpi] JOptionPane-Icons only partially visible when using Windows 10 L&F
hschreiber
parents:
37550
diff
changeset
|
132 |
} |
3978
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
133 |
|
39515
5f9e9e8bf57b
8151385: [hidpi] JOptionPane-Icons only partially visible when using Windows 10 L&F
hschreiber
parents:
37550
diff
changeset
|
134 |
return STANDARD_VIEW_BUTTONS[iconIndex]; |
3978
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
135 |
} |
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
136 |
|
2 | 137 |
// Special folders |
138 |
private static Win32ShellFolder2 desktop; |
|
139 |
private static Win32ShellFolder2 drives; |
|
140 |
private static Win32ShellFolder2 recent; |
|
141 |
private static Win32ShellFolder2 network; |
|
142 |
private static Win32ShellFolder2 personal; |
|
143 |
||
144 |
static Win32ShellFolder2 getDesktop() { |
|
145 |
if (desktop == null) { |
|
146 |
try { |
|
147 |
desktop = new Win32ShellFolder2(DESKTOP); |
|
25536 | 148 |
} catch (SecurityException e) { |
149 |
// Ignore error |
|
2 | 150 |
} catch (IOException e) { |
3346
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
151 |
// Ignore error |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
152 |
} catch (InterruptedException e) { |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
153 |
// Ignore error |
2 | 154 |
} |
155 |
} |
|
156 |
return desktop; |
|
157 |
} |
|
158 |
||
159 |
static Win32ShellFolder2 getDrives() { |
|
160 |
if (drives == null) { |
|
161 |
try { |
|
162 |
drives = new Win32ShellFolder2(DRIVES); |
|
25536 | 163 |
} catch (SecurityException e) { |
164 |
// Ignore error |
|
2 | 165 |
} catch (IOException e) { |
3346
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
166 |
// Ignore error |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
167 |
} catch (InterruptedException e) { |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
168 |
// Ignore error |
2 | 169 |
} |
170 |
} |
|
171 |
return drives; |
|
172 |
} |
|
173 |
||
174 |
static Win32ShellFolder2 getRecent() { |
|
175 |
if (recent == null) { |
|
176 |
try { |
|
177 |
String path = Win32ShellFolder2.getFileSystemPath(RECENT); |
|
178 |
if (path != null) { |
|
179 |
recent = createShellFolder(getDesktop(), new File(path)); |
|
180 |
} |
|
25536 | 181 |
} catch (SecurityException e) { |
182 |
// Ignore error |
|
3346
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
183 |
} catch (InterruptedException e) { |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
184 |
// Ignore error |
2 | 185 |
} catch (IOException e) { |
3346
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
186 |
// Ignore error |
2 | 187 |
} |
188 |
} |
|
189 |
return recent; |
|
190 |
} |
|
191 |
||
192 |
static Win32ShellFolder2 getNetwork() { |
|
193 |
if (network == null) { |
|
194 |
try { |
|
195 |
network = new Win32ShellFolder2(NETWORK); |
|
25536 | 196 |
} catch (SecurityException e) { |
197 |
// Ignore error |
|
2 | 198 |
} catch (IOException e) { |
3346
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
199 |
// Ignore error |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
200 |
} catch (InterruptedException e) { |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
201 |
// Ignore error |
2 | 202 |
} |
203 |
} |
|
204 |
return network; |
|
205 |
} |
|
206 |
||
207 |
static Win32ShellFolder2 getPersonal() { |
|
208 |
if (personal == null) { |
|
209 |
try { |
|
210 |
String path = Win32ShellFolder2.getFileSystemPath(PERSONAL); |
|
211 |
if (path != null) { |
|
212 |
Win32ShellFolder2 desktop = getDesktop(); |
|
213 |
personal = desktop.getChildByPath(path); |
|
214 |
if (personal == null) { |
|
215 |
personal = createShellFolder(getDesktop(), new File(path)); |
|
216 |
} |
|
217 |
if (personal != null) { |
|
218 |
personal.setIsPersonal(); |
|
219 |
} |
|
220 |
} |
|
25536 | 221 |
} catch (SecurityException e) { |
222 |
// Ignore error |
|
3346
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
223 |
} catch (InterruptedException e) { |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
224 |
// Ignore error |
2 | 225 |
} catch (IOException e) { |
3346
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
226 |
// Ignore error |
2 | 227 |
} |
228 |
} |
|
229 |
return personal; |
|
230 |
} |
|
231 |
||
232 |
||
233 |
private static File[] roots; |
|
234 |
||
235 |
/** |
|
35667 | 236 |
* @param key a {@code String} |
2 | 237 |
* "fileChooserDefaultFolder": |
35667 | 238 |
* Returns a {@code File} - the default shellfolder for a new filechooser |
2 | 239 |
* "roots": |
35667 | 240 |
* Returns a {@code File[]} - containing the root(s) of the displayable hierarchy |
2 | 241 |
* "fileChooserComboBoxFolders": |
35667 | 242 |
* Returns a {@code File[]} - an array of shellfolders representing the list to |
2 | 243 |
* show by default in the file chooser's combobox |
244 |
* "fileChooserShortcutPanelFolders": |
|
35667 | 245 |
* Returns a {@code File[]} - an array of shellfolders representing well-known |
2 | 246 |
* folders, such as Desktop, Documents, History, Network, Home, etc. |
247 |
* This is used in the shortcut panel of the filechooser on Windows 2000 |
|
248 |
* and Windows Me. |
|
3978
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
249 |
* "fileChooserIcon <icon>": |
35667 | 250 |
* Returns an {@code Image} - icon can be ListView, DetailsView, UpFolder, NewFolder or |
3978
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
251 |
* ViewMenu (Windows only). |
2 | 252 |
* "optionPaneIcon iconName": |
35667 | 253 |
* Returns an {@code Image} - icon from the system icon list |
2 | 254 |
* |
255 |
* @return An Object matching the key string. |
|
256 |
*/ |
|
257 |
public Object get(String key) { |
|
258 |
if (key.equals("fileChooserDefaultFolder")) { |
|
259 |
File file = getPersonal(); |
|
260 |
if (file == null) { |
|
261 |
file = getDesktop(); |
|
262 |
} |
|
28546 | 263 |
return checkFile(file); |
2 | 264 |
} else if (key.equals("roots")) { |
265 |
// Should be "History" and "Desktop" ? |
|
266 |
if (roots == null) { |
|
267 |
File desktop = getDesktop(); |
|
268 |
if (desktop != null) { |
|
269 |
roots = new File[] { desktop }; |
|
270 |
} else { |
|
271 |
roots = (File[])super.get(key); |
|
272 |
} |
|
273 |
} |
|
28546 | 274 |
return checkFiles(roots); |
2 | 275 |
} else if (key.equals("fileChooserComboBoxFolders")) { |
276 |
Win32ShellFolder2 desktop = getDesktop(); |
|
277 |
||
28546 | 278 |
if (desktop != null && checkFile(desktop) != null) { |
2 | 279 |
ArrayList<File> folders = new ArrayList<File>(); |
280 |
Win32ShellFolder2 drives = getDrives(); |
|
281 |
||
282 |
Win32ShellFolder2 recentFolder = getRecent(); |
|
283 |
if (recentFolder != null && OSInfo.getWindowsVersion().compareTo(OSInfo.WINDOWS_2000) >= 0) { |
|
284 |
folders.add(recentFolder); |
|
285 |
} |
|
286 |
||
287 |
folders.add(desktop); |
|
288 |
// Add all second level folders |
|
28556
cebfefd140cc
8062561: Test bug8055304 fails if file system default directory has read access
alexsch
parents:
28546
diff
changeset
|
289 |
File[] secondLevelFolders = checkFiles(desktop.listFiles()); |
2 | 290 |
Arrays.sort(secondLevelFolders); |
291 |
for (File secondLevelFolder : secondLevelFolders) { |
|
292 |
Win32ShellFolder2 folder = (Win32ShellFolder2) secondLevelFolder; |
|
4271
35fc7add4925
6550546: Win LAF: JFileChooser -> Look in Drop down should not display any shortcuts created on desktop
rupashka
parents:
3978
diff
changeset
|
293 |
if (!folder.isFileSystem() || (folder.isDirectory() && !folder.isLink())) { |
2 | 294 |
folders.add(folder); |
295 |
// Add third level for "My Computer" |
|
296 |
if (folder.equals(drives)) { |
|
28556
cebfefd140cc
8062561: Test bug8055304 fails if file system default directory has read access
alexsch
parents:
28546
diff
changeset
|
297 |
File[] thirdLevelFolders = checkFiles(folder.listFiles()); |
678
7d331a53a753
6571802: 'Shared Documents' listed in-between C,D drives in the JFileChooser, does not match with native
rupashka
parents:
454
diff
changeset
|
298 |
if (thirdLevelFolders != null && thirdLevelFolders.length > 0) { |
7d331a53a753
6571802: 'Shared Documents' listed in-between C,D drives in the JFileChooser, does not match with native
rupashka
parents:
454
diff
changeset
|
299 |
List<File> thirdLevelFoldersList = Arrays.asList(thirdLevelFolders); |
7d331a53a753
6571802: 'Shared Documents' listed in-between C,D drives in the JFileChooser, does not match with native
rupashka
parents:
454
diff
changeset
|
300 |
|
7d331a53a753
6571802: 'Shared Documents' listed in-between C,D drives in the JFileChooser, does not match with native
rupashka
parents:
454
diff
changeset
|
301 |
folder.sortChildren(thirdLevelFoldersList); |
7d331a53a753
6571802: 'Shared Documents' listed in-between C,D drives in the JFileChooser, does not match with native
rupashka
parents:
454
diff
changeset
|
302 |
folders.addAll(thirdLevelFoldersList); |
2 | 303 |
} |
304 |
} |
|
305 |
} |
|
306 |
} |
|
28546 | 307 |
return checkFiles(folders); |
2 | 308 |
} else { |
309 |
return super.get(key); |
|
310 |
} |
|
311 |
} else if (key.equals("fileChooserShortcutPanelFolders")) { |
|
312 |
Toolkit toolkit = Toolkit.getDefaultToolkit(); |
|
313 |
ArrayList<File> folders = new ArrayList<File>(); |
|
314 |
int i = 0; |
|
315 |
Object value; |
|
316 |
do { |
|
317 |
value = toolkit.getDesktopProperty("win.comdlg.placesBarPlace" + i++); |
|
318 |
try { |
|
319 |
if (value instanceof Integer) { |
|
320 |
// A CSIDL |
|
321 |
folders.add(new Win32ShellFolder2((Integer)value)); |
|
322 |
} else if (value instanceof String) { |
|
323 |
// A path |
|
324 |
folders.add(createShellFolder(new File((String)value))); |
|
325 |
} |
|
326 |
} catch (IOException e) { |
|
327 |
// Skip this value |
|
3346
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
328 |
} catch (InterruptedException e) { |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
329 |
// Return empty result |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
330 |
return new File[0]; |
2 | 331 |
} |
332 |
} while (value != null); |
|
333 |
||
334 |
if (folders.size() == 0) { |
|
335 |
// Use default list of places |
|
336 |
for (File f : new File[] { |
|
337 |
getRecent(), getDesktop(), getPersonal(), getDrives(), getNetwork() |
|
338 |
}) { |
|
339 |
if (f != null) { |
|
340 |
folders.add(f); |
|
341 |
} |
|
342 |
} |
|
343 |
} |
|
28546 | 344 |
return checkFiles(folders); |
2 | 345 |
} else if (key.startsWith("fileChooserIcon ")) { |
3978
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
346 |
String name = key.substring(key.indexOf(" ") + 1); |
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
347 |
|
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
348 |
int iconIndex; |
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
349 |
|
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
350 |
if (name.equals("ListView") || name.equals("ViewMenu")) { |
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
351 |
iconIndex = VIEW_LIST; |
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
352 |
} else if (name.equals("DetailsView")) { |
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
353 |
iconIndex = VIEW_DETAILS; |
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
354 |
} else if (name.equals("UpFolder")) { |
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
355 |
iconIndex = VIEW_PARENTFOLDER; |
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
356 |
} else if (name.equals("NewFolder")) { |
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
357 |
iconIndex = VIEW_NEWFOLDER; |
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
358 |
} else { |
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
359 |
return null; |
2 | 360 |
} |
3978
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
361 |
|
b024e01b947a
6840086: JFileChooser lacks icons on top right when running on Windows 7
rupashka
parents:
3507
diff
changeset
|
362 |
return getStandardViewButton(iconIndex); |
2 | 363 |
} else if (key.startsWith("optionPaneIcon ")) { |
364 |
Win32ShellFolder2.SystemIcon iconType; |
|
365 |
if (key == "optionPaneIcon Error") { |
|
366 |
iconType = Win32ShellFolder2.SystemIcon.IDI_ERROR; |
|
367 |
} else if (key == "optionPaneIcon Information") { |
|
368 |
iconType = Win32ShellFolder2.SystemIcon.IDI_INFORMATION; |
|
369 |
} else if (key == "optionPaneIcon Question") { |
|
370 |
iconType = Win32ShellFolder2.SystemIcon.IDI_QUESTION; |
|
371 |
} else if (key == "optionPaneIcon Warning") { |
|
372 |
iconType = Win32ShellFolder2.SystemIcon.IDI_EXCLAMATION; |
|
373 |
} else { |
|
374 |
return null; |
|
375 |
} |
|
376 |
return Win32ShellFolder2.getSystemIcon(iconType); |
|
454
2f4f4fef8880
6210674: FileChooser fails to load custom harddrive icon and gets NullPointerException
rupashka
parents:
2
diff
changeset
|
377 |
} else if (key.startsWith("shell32Icon ") || key.startsWith("shell32LargeIcon ")) { |
2f4f4fef8880
6210674: FileChooser fails to load custom harddrive icon and gets NullPointerException
rupashka
parents:
2
diff
changeset
|
378 |
String name = key.substring(key.indexOf(" ") + 1); |
2 | 379 |
try { |
454
2f4f4fef8880
6210674: FileChooser fails to load custom harddrive icon and gets NullPointerException
rupashka
parents:
2
diff
changeset
|
380 |
int i = Integer.parseInt(name); |
2 | 381 |
if (i >= 0) { |
454
2f4f4fef8880
6210674: FileChooser fails to load custom harddrive icon and gets NullPointerException
rupashka
parents:
2
diff
changeset
|
382 |
return Win32ShellFolder2.getShell32Icon(i, key.startsWith("shell32LargeIcon ")); |
2 | 383 |
} |
384 |
} catch (NumberFormatException ex) { |
|
385 |
} |
|
386 |
} |
|
387 |
return null; |
|
388 |
} |
|
389 |
||
28546 | 390 |
private File checkFile(File file) { |
391 |
SecurityManager sm = System.getSecurityManager(); |
|
392 |
return (sm == null || file == null) ? file : checkFile(file, sm); |
|
393 |
} |
|
394 |
||
395 |
private File checkFile(File file, SecurityManager sm) { |
|
396 |
try { |
|
397 |
sm.checkRead(file.getPath()); |
|
398 |
return file; |
|
399 |
} catch (SecurityException se) { |
|
400 |
return null; |
|
401 |
} |
|
402 |
} |
|
403 |
||
404 |
private File[] checkFiles(File[] files) { |
|
405 |
SecurityManager sm = System.getSecurityManager(); |
|
406 |
if (sm == null || files == null || files.length == 0) { |
|
407 |
return files; |
|
408 |
} |
|
409 |
return checkFiles(Arrays.stream(files), sm); |
|
410 |
} |
|
411 |
||
412 |
private File[] checkFiles(List<File> files) { |
|
413 |
SecurityManager sm = System.getSecurityManager(); |
|
414 |
if (sm == null || files.isEmpty()) { |
|
415 |
return files.toArray(new File[files.size()]); |
|
416 |
} |
|
417 |
return checkFiles(files.stream(), sm); |
|
418 |
} |
|
419 |
||
420 |
private File[] checkFiles(Stream<File> filesStream, SecurityManager sm) { |
|
421 |
return filesStream.filter((file) -> checkFile(file, sm) != null) |
|
422 |
.toArray(File[]::new); |
|
423 |
} |
|
424 |
||
2 | 425 |
/** |
35667 | 426 |
* Does {@code dir} represent a "computer" such as a node on the network, or |
2 | 427 |
* "My Computer" on the desktop. |
428 |
*/ |
|
3507
1610d6f5a0e3
6461173: One JCK test([NewFolderAction0001]) failed on Windows due to lack of PropertyPermission(s)
rupashka
parents:
3346
diff
changeset
|
429 |
public boolean isComputerNode(final File dir) { |
2 | 430 |
if (dir != null && dir == getDrives()) { |
431 |
return true; |
|
432 |
} else { |
|
3507
1610d6f5a0e3
6461173: One JCK test([NewFolderAction0001]) failed on Windows due to lack of PropertyPermission(s)
rupashka
parents:
3346
diff
changeset
|
433 |
String path = AccessController.doPrivileged(new PrivilegedAction<String>() { |
1610d6f5a0e3
6461173: One JCK test([NewFolderAction0001]) failed on Windows due to lack of PropertyPermission(s)
rupashka
parents:
3346
diff
changeset
|
434 |
public String run() { |
1610d6f5a0e3
6461173: One JCK test([NewFolderAction0001]) failed on Windows due to lack of PropertyPermission(s)
rupashka
parents:
3346
diff
changeset
|
435 |
return dir.getAbsolutePath(); |
1610d6f5a0e3
6461173: One JCK test([NewFolderAction0001]) failed on Windows due to lack of PropertyPermission(s)
rupashka
parents:
3346
diff
changeset
|
436 |
} |
1610d6f5a0e3
6461173: One JCK test([NewFolderAction0001]) failed on Windows due to lack of PropertyPermission(s)
rupashka
parents:
3346
diff
changeset
|
437 |
}); |
1610d6f5a0e3
6461173: One JCK test([NewFolderAction0001]) failed on Windows due to lack of PropertyPermission(s)
rupashka
parents:
3346
diff
changeset
|
438 |
|
2 | 439 |
return (path.startsWith("\\\\") && path.indexOf("\\", 2) < 0); //Network path |
440 |
} |
|
441 |
} |
|
442 |
||
443 |
public boolean isFileSystemRoot(File dir) { |
|
444 |
//Note: Removable drives don't "exist" but are listed in "My Computer" |
|
445 |
if (dir != null) { |
|
47190
8aff50fc76a5
8175015: FileSystemView.isDrive(File) memory leak on "C:\" file reference
pkbalakr
parents:
39515
diff
changeset
|
446 |
|
2 | 447 |
if (dir instanceof Win32ShellFolder2) { |
448 |
Win32ShellFolder2 sf = (Win32ShellFolder2)dir; |
|
47190
8aff50fc76a5
8175015: FileSystemView.isDrive(File) memory leak on "C:\" file reference
pkbalakr
parents:
39515
diff
changeset
|
449 |
|
8aff50fc76a5
8175015: FileSystemView.isDrive(File) memory leak on "C:\" file reference
pkbalakr
parents:
39515
diff
changeset
|
450 |
return (sf.isFileSystem() && sf.parent != null && |
8aff50fc76a5
8175015: FileSystemView.isDrive(File) memory leak on "C:\" file reference
pkbalakr
parents:
39515
diff
changeset
|
451 |
sf.parent.equals(Win32ShellFolder2.listRoots())); |
2 | 452 |
} |
453 |
String path = dir.getPath(); |
|
5448
96e9d2b5c719
6945316: The Win32ShellFolderManager2.isFileSystemRoot can throw NPE
rupashka
parents:
4275
diff
changeset
|
454 |
|
96e9d2b5c719
6945316: The Win32ShellFolderManager2.isFileSystemRoot can throw NPE
rupashka
parents:
4275
diff
changeset
|
455 |
if (path.length() != 3 || path.charAt(1) != ':') { |
96e9d2b5c719
6945316: The Win32ShellFolderManager2.isFileSystemRoot can throw NPE
rupashka
parents:
4275
diff
changeset
|
456 |
return false; |
96e9d2b5c719
6945316: The Win32ShellFolderManager2.isFileSystemRoot can throw NPE
rupashka
parents:
4275
diff
changeset
|
457 |
} |
96e9d2b5c719
6945316: The Win32ShellFolderManager2.isFileSystemRoot can throw NPE
rupashka
parents:
4275
diff
changeset
|
458 |
|
47190
8aff50fc76a5
8175015: FileSystemView.isDrive(File) memory leak on "C:\" file reference
pkbalakr
parents:
39515
diff
changeset
|
459 |
File[] roots = Win32ShellFolder2.listRoots(); |
5448
96e9d2b5c719
6945316: The Win32ShellFolderManager2.isFileSystemRoot can throw NPE
rupashka
parents:
4275
diff
changeset
|
460 |
|
47190
8aff50fc76a5
8175015: FileSystemView.isDrive(File) memory leak on "C:\" file reference
pkbalakr
parents:
39515
diff
changeset
|
461 |
return roots != null && Arrays.asList(roots).contains(dir); |
2 | 462 |
} |
463 |
return false; |
|
464 |
} |
|
465 |
||
25192
4e2dc0f8702d
8044551: Fix raw and unchecked lint warnings in platform-specific sun.awt files
henryjen
parents:
24520
diff
changeset
|
466 |
private static List<Win32ShellFolder2> topFolderList = null; |
2 | 467 |
static int compareShellFolders(Win32ShellFolder2 sf1, Win32ShellFolder2 sf2) { |
468 |
boolean special1 = sf1.isSpecial(); |
|
469 |
boolean special2 = sf2.isSpecial(); |
|
470 |
||
471 |
if (special1 || special2) { |
|
472 |
if (topFolderList == null) { |
|
25192
4e2dc0f8702d
8044551: Fix raw and unchecked lint warnings in platform-specific sun.awt files
henryjen
parents:
24520
diff
changeset
|
473 |
ArrayList<Win32ShellFolder2> tmpTopFolderList = new ArrayList<>(); |
2 | 474 |
tmpTopFolderList.add(Win32ShellFolderManager2.getPersonal()); |
475 |
tmpTopFolderList.add(Win32ShellFolderManager2.getDesktop()); |
|
476 |
tmpTopFolderList.add(Win32ShellFolderManager2.getDrives()); |
|
477 |
tmpTopFolderList.add(Win32ShellFolderManager2.getNetwork()); |
|
478 |
topFolderList = tmpTopFolderList; |
|
479 |
} |
|
480 |
int i1 = topFolderList.indexOf(sf1); |
|
481 |
int i2 = topFolderList.indexOf(sf2); |
|
482 |
if (i1 >= 0 && i2 >= 0) { |
|
483 |
return (i1 - i2); |
|
484 |
} else if (i1 >= 0) { |
|
485 |
return -1; |
|
486 |
} else if (i2 >= 0) { |
|
487 |
return 1; |
|
488 |
} |
|
489 |
} |
|
490 |
||
491 |
// Non-file shellfolders sort before files |
|
492 |
if (special1 && !special2) { |
|
493 |
return -1; |
|
494 |
} else if (special2 && !special1) { |
|
495 |
return 1; |
|
496 |
} |
|
497 |
||
498 |
return compareNames(sf1.getAbsolutePath(), sf2.getAbsolutePath()); |
|
499 |
} |
|
500 |
||
501 |
static int compareNames(String name1, String name2) { |
|
502 |
// First ignore case when comparing |
|
678
7d331a53a753
6571802: 'Shared Documents' listed in-between C,D drives in the JFileChooser, does not match with native
rupashka
parents:
454
diff
changeset
|
503 |
int diff = name1.compareToIgnoreCase(name2); |
2 | 504 |
if (diff != 0) { |
505 |
return diff; |
|
506 |
} else { |
|
507 |
// May differ in case (e.g. "mail" vs. "Mail") |
|
508 |
// We need this test for consistent sorting |
|
509 |
return name1.compareTo(name2); |
|
510 |
} |
|
511 |
} |
|
2489
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
512 |
|
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
513 |
@Override |
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
514 |
protected Invoker createInvoker() { |
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
515 |
return new ComInvoker(); |
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
516 |
} |
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
517 |
|
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
518 |
private static class ComInvoker extends ThreadPoolExecutor implements ThreadFactory, ShellFolder.Invoker { |
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
519 |
private static Thread comThread; |
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
520 |
|
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
521 |
private ComInvoker() { |
29922 | 522 |
super(1, 1, 0, TimeUnit.DAYS, new LinkedBlockingQueue<>()); |
2489
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
523 |
allowCoreThreadTimeOut(false); |
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
524 |
setThreadFactory(this); |
29922 | 525 |
final Runnable shutdownHook = () -> AccessController.doPrivileged((PrivilegedAction<Void>) () -> { |
526 |
shutdownNow(); |
|
527 |
return null; |
|
528 |
}); |
|
529 |
AccessController.doPrivileged((PrivilegedAction<Void>) () -> { |
|
37550
c8252b8fea3d
8147544: Remove sun.misc.ManagedLocalsThread from java.desktop
prr
parents:
35667
diff
changeset
|
530 |
Thread t = new Thread( |
c8252b8fea3d
8147544: Remove sun.misc.ManagedLocalsThread from java.desktop
prr
parents:
35667
diff
changeset
|
531 |
ThreadGroupUtils.getRootThreadGroup(), shutdownHook, |
c8252b8fea3d
8147544: Remove sun.misc.ManagedLocalsThread from java.desktop
prr
parents:
35667
diff
changeset
|
532 |
"ShellFolder", 0, false); |
29922 | 533 |
Runtime.getRuntime().addShutdownHook(t); |
534 |
return null; |
|
2489
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
535 |
}); |
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
536 |
} |
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
537 |
|
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
538 |
public synchronized Thread newThread(final Runnable task) { |
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
539 |
final Runnable comRun = new Runnable() { |
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
540 |
public void run() { |
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
541 |
try { |
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
542 |
initializeCom(); |
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
543 |
task.run(); |
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
544 |
} finally { |
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
545 |
uninitializeCom(); |
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
546 |
} |
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
547 |
} |
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
548 |
}; |
29922 | 549 |
comThread = AccessController.doPrivileged((PrivilegedAction<Thread>) () -> { |
550 |
String name = "Swing-Shell"; |
|
31653
d88ff422c7fb
8080405: Exception in thread "AWT-EventQueue-1" java.security.AccessControlException
serb
parents:
31430
diff
changeset
|
551 |
/* The thread must be a member of a thread group |
d88ff422c7fb
8080405: Exception in thread "AWT-EventQueue-1" java.security.AccessControlException
serb
parents:
31430
diff
changeset
|
552 |
* which will not get GCed before VM exit. |
d88ff422c7fb
8080405: Exception in thread "AWT-EventQueue-1" java.security.AccessControlException
serb
parents:
31430
diff
changeset
|
553 |
* Make its parent the top-level thread group. |
d88ff422c7fb
8080405: Exception in thread "AWT-EventQueue-1" java.security.AccessControlException
serb
parents:
31430
diff
changeset
|
554 |
*/ |
37550
c8252b8fea3d
8147544: Remove sun.misc.ManagedLocalsThread from java.desktop
prr
parents:
35667
diff
changeset
|
555 |
Thread thread = new Thread( |
c8252b8fea3d
8147544: Remove sun.misc.ManagedLocalsThread from java.desktop
prr
parents:
35667
diff
changeset
|
556 |
ThreadGroupUtils.getRootThreadGroup(), comRun, name, |
c8252b8fea3d
8147544: Remove sun.misc.ManagedLocalsThread from java.desktop
prr
parents:
35667
diff
changeset
|
557 |
0, false); |
29922 | 558 |
thread.setDaemon(true); |
47190
8aff50fc76a5
8175015: FileSystemView.isDrive(File) memory leak on "C:\" file reference
pkbalakr
parents:
39515
diff
changeset
|
559 |
/* This is important, since this thread running at lower priority |
8aff50fc76a5
8175015: FileSystemView.isDrive(File) memory leak on "C:\" file reference
pkbalakr
parents:
39515
diff
changeset
|
560 |
leads to memory consumption when listDrives() function is called |
8aff50fc76a5
8175015: FileSystemView.isDrive(File) memory leak on "C:\" file reference
pkbalakr
parents:
39515
diff
changeset
|
561 |
repeatedly. |
8aff50fc76a5
8175015: FileSystemView.isDrive(File) memory leak on "C:\" file reference
pkbalakr
parents:
39515
diff
changeset
|
562 |
*/ |
8aff50fc76a5
8175015: FileSystemView.isDrive(File) memory leak on "C:\" file reference
pkbalakr
parents:
39515
diff
changeset
|
563 |
thread.setPriority(Thread.MAX_PRIORITY); |
29922 | 564 |
return thread; |
565 |
}); |
|
2489
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
566 |
return comThread; |
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
567 |
} |
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
568 |
|
3346
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
569 |
public <T> T invoke(Callable<T> task) throws Exception { |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
570 |
if (Thread.currentThread() == comThread) { |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
571 |
// if it's already called from the COM |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
572 |
// thread, we don't need to delegate the task |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
573 |
return task.call(); |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
574 |
} else { |
3507
1610d6f5a0e3
6461173: One JCK test([NewFolderAction0001]) failed on Windows due to lack of PropertyPermission(s)
rupashka
parents:
3346
diff
changeset
|
575 |
final Future<T> future; |
3346
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
576 |
|
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
577 |
try { |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
578 |
future = submit(task); |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
579 |
} catch (RejectedExecutionException e) { |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
580 |
throw new InterruptedException(e.getMessage()); |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
581 |
} |
2817
f171f2417978
6713352: Deadlock in JFileChooser with synchronized custom FileSystemView
rupashka
parents:
2489
diff
changeset
|
582 |
|
3346
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
583 |
try { |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
584 |
return future.get(); |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
585 |
} catch (InterruptedException e) { |
3507
1610d6f5a0e3
6461173: One JCK test([NewFolderAction0001]) failed on Windows due to lack of PropertyPermission(s)
rupashka
parents:
3346
diff
changeset
|
586 |
AccessController.doPrivileged(new PrivilegedAction<Void>() { |
1610d6f5a0e3
6461173: One JCK test([NewFolderAction0001]) failed on Windows due to lack of PropertyPermission(s)
rupashka
parents:
3346
diff
changeset
|
587 |
public Void run() { |
1610d6f5a0e3
6461173: One JCK test([NewFolderAction0001]) failed on Windows due to lack of PropertyPermission(s)
rupashka
parents:
3346
diff
changeset
|
588 |
future.cancel(true); |
1610d6f5a0e3
6461173: One JCK test([NewFolderAction0001]) failed on Windows due to lack of PropertyPermission(s)
rupashka
parents:
3346
diff
changeset
|
589 |
|
1610d6f5a0e3
6461173: One JCK test([NewFolderAction0001]) failed on Windows due to lack of PropertyPermission(s)
rupashka
parents:
3346
diff
changeset
|
590 |
return null; |
1610d6f5a0e3
6461173: One JCK test([NewFolderAction0001]) failed on Windows due to lack of PropertyPermission(s)
rupashka
parents:
3346
diff
changeset
|
591 |
} |
1610d6f5a0e3
6461173: One JCK test([NewFolderAction0001]) failed on Windows due to lack of PropertyPermission(s)
rupashka
parents:
3346
diff
changeset
|
592 |
}); |
3346
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
593 |
|
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
594 |
throw e; |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
595 |
} catch (ExecutionException e) { |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
596 |
Throwable cause = e.getCause(); |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
597 |
|
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
598 |
if (cause instanceof Exception) { |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
599 |
throw (Exception) cause; |
2489
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
600 |
} |
3346
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
601 |
|
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
602 |
if (cause instanceof Error) { |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
603 |
throw (Error) cause; |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
604 |
} |
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
605 |
|
1c65be97eaa2
6460525: javax/swing/JFileChooser/6396844/TwentyThousandTest.java times out
rupashka
parents:
2817
diff
changeset
|
606 |
throw new RuntimeException("Unexpected error", cause); |
2489
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
607 |
} |
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
608 |
} |
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
609 |
} |
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
610 |
} |
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
611 |
|
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
612 |
static native void initializeCom(); |
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
613 |
|
5052722686e2
6491795: COM should be initialized for Shell API calls in ShellFolder2.cpp
rupashka
parents:
715
diff
changeset
|
614 |
static native void uninitializeCom(); |
2 | 615 |
} |