infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-22 03:17:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

8026869: [macosx] Support apple.awt.use-file-dialog-packages property

Browse Source 
Reviewed-by: anthony, serb
This commit is contained in:
Petr Pchelko 2013-12-17 11:44:25 +04:00
parent 815543bb82
commit 30fc9d68b2
3 changed files with 134 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jdk/src/macosx/classes/sun/lwawt/macosx/CFileDialog.java
View File

@ -46,17 +46,16 @@ class CFileDialog implements FileDialogPeer {
@Override
public void run() {
try {
boolean navigateApps = false;
boolean navigateApps = !AccessController.doPrivileged(
new GetBooleanAction("apple.awt.use-file-dialog-packages"));
boolean chooseDirectories = AccessController.doPrivileged(
new GetBooleanAction("apple.awt.fileDialogForDirectories"));
int dialogMode = target.getMode();
navigateApps = true;
String title = target.getTitle();
if (title == null) {
title = " ";
}
Boolean chooseDirectories = AccessController.doPrivileged(
new GetBooleanAction("apple.awt.fileDialogForDirectories"));
String[] userFileNames = nativeRunFileDialog(title,
dialogMode,

45
jdk/test/java/awt/FileDialog/FileDialogForPackages/FileDialogForPackages.html Normal file
View File

@ -0,0 +1,45 @@
<!--
Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
This code is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License version 2 only, as
published by the Free Software Foundation.
This code is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
version 2 for more details (a copy is included in the LICENSE file that
accompanied this code).
You should have received a copy of the GNU General Public License version
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
or visit www.oracle.com if you need additional information or have any
questions.
-->
<html>
<!--
@test
@bug 8026869
@summary Support apple.awt.use-file-dialog-packages property.
@author Petr Pchelko area=awt.filedialog
@library ../../regtesthelpers
@build Sysout
@run applet/manual=yesno FileDialogForPackages.html
-->
<head>
<title> FileDialogForPackages </title>
</head>
<body>
<h1>FileDialogForPackages<br>Bug ID: 8026869</h1>
<p> See the dialog box (usually in upper left corner) for instructions</p>
<APPLET CODE="FileDialogForPackages.class" WIDTH=200 HEIGHT=200></APPLET>
</body>
</html>

84
jdk/test/java/awt/FileDialog/FileDialogForPackages/FileDialogForPackages.java Normal file
View File

@ -0,0 +1,84 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
import sun.awt.OSInfo;
import test.java.awt.regtesthelpers.Sysout;
import java.applet.Applet;
import java.awt.Button;
import java.awt.FileDialog;
import java.awt.Frame;
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
public class FileDialogForPackages extends Applet implements ActionListener {
private static final String APPLICATIONS_FOLDER = "/Applications";
private volatile Button showBtn;
private volatile FileDialog fd;
@Override
public void init() {
if (OSInfo.getOSType() != OSInfo.OSType.MACOSX) {
Sysout.createDialogWithInstructions(new String[]{
"Press PASS, this test is for MacOS X only."});
return;
}
System.setProperty("apple.awt.use-file-dialog-packages", "true");
setLayout(new GridLayout(1, 1));
fd = new FileDialog(new Frame(), "Open");
fd.setDirectory(APPLICATIONS_FOLDER);
showBtn = new Button("Show File Dialog");
showBtn.addActionListener(this);
add(showBtn);
String[] instructions = {
"1) Click on 'Show File Dialog' button. A file dialog will come up.",
"2) Navigate to the Applications folder if not already there",
"3) Check that the application bundles can be selected and can not be navigated",
"4) If it's true then the test passed, otherwise it failed."};
Sysout.createDialogWithInstructions(instructions);
}
@Override
public void start() {
setSize(200, 200);
show();
}
@Override
public void actionPerformed(ActionEvent e) {
if (e.getSource() == showBtn) {
fd.setVisible(true);
String output = fd.getFile();
if (output != null) {
Sysout.println(output + " is selected");
}
}
}
}