# HG changeset patch # User pchelko # Date 1387266265 -14400 # Node ID 1125cbc3f4b711eb44d31917dc47571dc11739e3 # Parent b9f47a000ebdf7873a54b91ac792a8caf0c8d25a 8026869: [macosx] Support apple.awt.use-file-dialog-packages property Reviewed-by: anthony, serb diff -r b9f47a000ebd -r 1125cbc3f4b7 jdk/src/macosx/classes/sun/lwawt/macosx/CFileDialog.java --- a/jdk/src/macosx/classes/sun/lwawt/macosx/CFileDialog.java Tue Dec 17 11:19:27 2013 +0400 +++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CFileDialog.java Tue Dec 17 11:44:25 2013 +0400 @@ -46,17 +46,16 @@ @Override public void run() { try { - boolean navigateApps = false; - int dialogMode = target.getMode(); + boolean navigateApps = !AccessController.doPrivileged( + new GetBooleanAction("apple.awt.use-file-dialog-packages")); + boolean chooseDirectories = AccessController.doPrivileged( + new GetBooleanAction("apple.awt.fileDialogForDirectories")); - navigateApps = true; - + int dialogMode = target.getMode(); String title = target.getTitle(); if (title == null) { title = " "; } - Boolean chooseDirectories = AccessController.doPrivileged( - new GetBooleanAction("apple.awt.fileDialogForDirectories")); String[] userFileNames = nativeRunFileDialog(title, dialogMode, diff -r b9f47a000ebd -r 1125cbc3f4b7 jdk/test/java/awt/FileDialog/FileDialogForPackages/FileDialogForPackages.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/java/awt/FileDialog/FileDialogForPackages/FileDialogForPackages.html Tue Dec 17 11:44:25 2013 +0400 @@ -0,0 +1,45 @@ + + + + + + FileDialogForPackages + + + +

FileDialogForPackages
Bug ID: 8026869

+ +

See the dialog box (usually in upper left corner) for instructions

+ + + + diff -r b9f47a000ebd -r 1125cbc3f4b7 jdk/test/java/awt/FileDialog/FileDialogForPackages/FileDialogForPackages.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/java/awt/FileDialog/FileDialogForPackages/FileDialogForPackages.java Tue Dec 17 11:44:25 2013 +0400 @@ -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"); + } + } + } +}