Skip to content

Commit 79dd472

Browse files
prsadhukprsadhuk
committedAug 27, 2020
8250935: JFileChooser incorrectly placed "Date" value in "Type" field
Reviewed-by: prr
·
JEP-429-branchpoint
1 parent e0989c0 commit 79dd472

File tree

2 files changed

+210
-2
lines changed

2 files changed

+210
-2
lines changed
 

‎src/java.desktop/share/classes/sun/awt/shell/ShellFolder.java

+8-2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
import java.nio.file.Files;
3434
import java.nio.file.LinkOption;
3535
import java.nio.file.Paths;
36+
import java.text.Format;
37+
import java.text.SimpleDateFormat;
3638
import java.util.*;
3739
import java.util.concurrent.Callable;
3840

@@ -479,12 +481,16 @@ public static Object getFolderColumnValue(File file, int column) {
479481
case 1: // size
480482
return file.isDirectory() ? null : Long.valueOf(file.length());
481483

482-
case 2: // date
484+
case 2: // type
485+
return file.isDirectory() ? new String("File folder"): null;
486+
487+
case 3: // date
483488
if (isFileSystemRoot(file)) {
484489
return null;
485490
}
486491
long time = file.lastModified();
487-
return (time == 0L) ? null : new Date(time);
492+
Format formatter = new SimpleDateFormat("dd-MMM-yy hh:mm aa");
493+
return (time == 0L) ? null : formatter.format(new Date(time));
488494

489495
default:
490496
return null;

‎test/jdk/javax/swing/JFileChooser/JFileChooserHomeDetailsInfo.java

+202
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
/*
2+
* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
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
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*/
23+
24+
/* @test
25+
@bug 8250935
26+
@summary Verifies Date info is placed under correct field
27+
@run main/manual JFileChooserHomeDetailsInfo
28+
*/
29+
30+
import java.awt.BorderLayout;
31+
import java.awt.FlowLayout;
32+
import java.awt.event.WindowAdapter;
33+
import java.awt.event.WindowEvent;
34+
import java.util.concurrent.CountDownLatch;
35+
import java.util.concurrent.TimeUnit;
36+
import javax.swing.JButton;
37+
import javax.swing.JDialog;
38+
import javax.swing.JFrame;
39+
import javax.swing.JFileChooser;
40+
import javax.swing.JLabel;
41+
import javax.swing.JPanel;
42+
import javax.swing.JTextArea;
43+
import javax.swing.SwingUtilities;
44+
import javax.swing.Timer;
45+
import javax.swing.WindowConstants;
46+
import javax.swing.UIManager;
47+
import javax.swing.UnsupportedLookAndFeelException;
48+
49+
public class JFileChooserHomeDetailsInfo {
50+
private static final CountDownLatch testEndedSignal = new CountDownLatch(1);
51+
private static final int testTimeout = 300000;
52+
private static volatile String testFailureMsg;
53+
private static volatile boolean testPassed;
54+
private static volatile boolean testFinished;
55+
56+
public static void main(String[] args) throws Exception {
57+
try {
58+
UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
59+
} catch (ClassNotFoundException | InstantiationException | IllegalAccessException
60+
| UnsupportedLookAndFeelException e) {
61+
e.printStackTrace();
62+
}
63+
SwingUtilities.invokeLater(() -> createAndShowTestDialog());
64+
65+
try {
66+
if (!testEndedSignal.await(testTimeout, TimeUnit.MILLISECONDS)) {
67+
throw new RuntimeException(String.format(
68+
"Test timeout '%d ms' elapsed.", testTimeout));
69+
}
70+
if (!testPassed) {
71+
String failureMsg = testFailureMsg;
72+
if ((failureMsg != null) && (!failureMsg.trim().isEmpty())) {
73+
throw new RuntimeException(failureMsg);
74+
} else {
75+
throw new RuntimeException("Test failed.");
76+
}
77+
}
78+
} catch (InterruptedException ie) {
79+
throw new RuntimeException(ie);
80+
} finally {
81+
testFinished = true;
82+
}
83+
}
84+
85+
private static void doTest() throws Exception {
86+
JFileChooser fChooser = new JFileChooser();
87+
88+
fChooser.setDialogTitle("Please select folder...");
89+
fChooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES );
90+
91+
fChooser.showOpenDialog(new JFrame());
92+
}
93+
94+
private static void pass() {
95+
testPassed = true;
96+
testEndedSignal.countDown();
97+
}
98+
99+
private static void fail(String failureMsg) {
100+
testFailureMsg = failureMsg;
101+
testPassed = false;
102+
testEndedSignal.countDown();
103+
}
104+
105+
private static String convertMillisToTimeStr(int millis) {
106+
if (millis < 0) {
107+
return "00:00:00";
108+
}
109+
int hours = millis / 3600000;
110+
int minutes = (millis - hours * 3600000) / 60000;
111+
int seconds = (millis - hours * 3600000 - minutes * 60000) / 1000;
112+
return String.format("%02d:%02d:%02d", hours, minutes, seconds);
113+
}
114+
115+
private static void createAndShowTestDialog() {
116+
String description =
117+
" 1. Click on \"Start Test\" button.\r\n" +
118+
" 2. A JFileChooser file dialog will be shown. \r\n" +
119+
" 3. Click on \"Details\" button to show file details.\r\n" +
120+
" 4. Click on \"Home\" button on file dialog.\r\n" +
121+
"\r\n" +
122+
" If the \"Modified\" date time info is appearing in \"Type\" field for user directory\r\n"+
123+
" cancel the dialog and click on \"FAIL\" button, else click on \"PASS\" button.";
124+
125+
final JDialog dialog = new JDialog();
126+
dialog.setTitle("PropertiesButtonPrintDialog");
127+
dialog.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
128+
dialog.addWindowListener(new WindowAdapter() {
129+
@Override
130+
public void windowClosing(WindowEvent e) {
131+
dialog.dispose();
132+
fail("Main dialog was closed.");
133+
}
134+
});
135+
136+
final JLabel testTimeoutLabel = new JLabel(String.format(
137+
"Test timeout: %s", convertMillisToTimeStr(testTimeout)));
138+
final long startTime = System.currentTimeMillis();
139+
final Timer timer = new Timer(0, null);
140+
timer.setDelay(1000);
141+
timer.addActionListener((e) -> {
142+
int leftTime = testTimeout - (int) (System.currentTimeMillis() - startTime);
143+
if ((leftTime < 0) || testFinished) {
144+
timer.stop();
145+
dialog.dispose();
146+
}
147+
testTimeoutLabel.setText(String.format(
148+
"Test timeout: %s", convertMillisToTimeStr(leftTime)));
149+
});
150+
timer.start();
151+
152+
JTextArea textArea = new JTextArea(description);
153+
textArea.setEditable(false);
154+
155+
final JButton testButton = new JButton("Start Test");
156+
final JButton passButton = new JButton("PASS");
157+
final JButton failButton = new JButton("FAIL");
158+
testButton.addActionListener((e) -> {
159+
testButton.setEnabled(false);
160+
new Thread(() -> {
161+
try {
162+
doTest();
163+
164+
SwingUtilities.invokeLater(() -> {
165+
passButton.setEnabled(true);
166+
failButton.setEnabled(true);
167+
});
168+
} catch (Throwable t) {
169+
t.printStackTrace();
170+
dialog.dispose();
171+
fail("Exception occurred in a thread executing the test.");
172+
}
173+
}).start();
174+
});
175+
passButton.setEnabled(false);
176+
passButton.addActionListener((e) -> {
177+
dialog.dispose();
178+
pass();
179+
});
180+
failButton.setEnabled(false);
181+
failButton.addActionListener((e) -> {
182+
dialog.dispose();
183+
fail(" Date info is placed in the Type column");
184+
});
185+
186+
JPanel mainPanel = new JPanel(new BorderLayout());
187+
JPanel labelPanel = new JPanel(new FlowLayout());
188+
labelPanel.add(testTimeoutLabel);
189+
mainPanel.add(labelPanel, BorderLayout.NORTH);
190+
mainPanel.add(textArea, BorderLayout.CENTER);
191+
JPanel buttonPanel = new JPanel(new FlowLayout());
192+
buttonPanel.add(testButton);
193+
buttonPanel.add(passButton);
194+
buttonPanel.add(failButton);
195+
mainPanel.add(buttonPanel, BorderLayout.SOUTH);
196+
dialog.add(mainPanel);
197+
198+
dialog.pack();
199+
dialog.setVisible(true);
200+
}
201+
202+
}

0 commit comments

Comments
 (0)
Please sign in to comment.