Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
Automatic merge of client:master into master
  • Loading branch information
duke committed Aug 28, 2020
2 parents c4bcb12 + 015c0b5 commit 47ea44d7bdc1d82434adc1abbae64128ae3f2295
Showing with 2 additions and 208 deletions.
  1. +2 −6 src/java.desktop/share/classes/sun/awt/shell/ShellFolder.java
  2. +0 −202 test/jdk/javax/swing/JFileChooser/JFileChooserHomeDetailsInfo.java
@@ -481,16 +481,12 @@ public static Object getFolderColumnValue(File file, int column) {
case 1: // size
return file.isDirectory() ? null : Long.valueOf(file.length());

case 2: // type
return file.isDirectory() ? new String("File folder"): null;

case 3: // date
case 2: // date
if (isFileSystemRoot(file)) {
return null;
}
long time = file.lastModified();
Format formatter = new SimpleDateFormat("dd-MMM-yy hh:mm aa");
return (time == 0L) ? null : formatter.format(new Date(time));
return (time == 0L) ? null : new Date(time);

default:
return null;

This file was deleted.

0 comments on commit 47ea44d

Please sign in to comment.