From 0305f2bafd32d269e443251b1ae620e09e3f5dd3 Mon Sep 17 00:00:00 2001 From: Rob Greene Date: Tue, 17 Nov 2020 23:16:20 -0600 Subject: [PATCH] Adding long date to the long format listings for ProDOS. This is similar to CAT versus CATALOG, and should really have been that format in the first place. #42 --- .../applecommander/storage/os/prodos/ProdosFileEntry.java | 6 ++++-- .../applecommander/storage/StorageBundle.properties | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosFileEntry.java b/src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosFileEntry.java index 434a9a7..ec15c51 100644 --- a/src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosFileEntry.java +++ b/src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosFileEntry.java @@ -401,6 +401,8 @@ public class ProdosFileEntry extends ProdosCommonEntry implements FileEntry { NumberFormat numberFormat = NumberFormat.getNumberInstance(); SimpleDateFormat dateFormat = new SimpleDateFormat( textBundle.get("DateFormat")); //$NON-NLS-1$ + SimpleDateFormat dateTimeFormat = new SimpleDateFormat( + textBundle.get("DateTimeFormat")); List list = new ArrayList<>(); switch (displayMode) { @@ -445,9 +447,9 @@ public class ProdosFileEntry extends ProdosCommonEntry implements FileEntry { list.add(numberFormat.format(getBlocksUsed())); list.add(getLastModificationDate() == null ? textBundle.get("ProdosFileEntry.NullDate") : //$NON-NLS-1$ - dateFormat.format(getLastModificationDate())); + dateTimeFormat.format(getLastModificationDate())); list.add(getCreationDate() == null ? textBundle.get("ProdosFileEntry.NullDate") : //$NON-NLS-1$ - dateFormat.format(getCreationDate())); + dateTimeFormat.format(getCreationDate())); numberFormat.setMinimumIntegerDigits(1); list.add(numberFormat.format(getEofPosition())); if ("TXT".equals(getFiletype()) && getAuxiliaryType() > 0) { //$NON-NLS-1$ diff --git a/src/main/resources/com/webcodepro/applecommander/storage/StorageBundle.properties b/src/main/resources/com/webcodepro/applecommander/storage/StorageBundle.properties index 20ee896..e397155 100644 --- a/src/main/resources/com/webcodepro/applecommander/storage/StorageBundle.properties +++ b/src/main/resources/com/webcodepro/applecommander/storage/StorageBundle.properties @@ -9,6 +9,7 @@ UsedBlocks=Used Blocks DeletedQ=Deleted? Blocks=Blocks DateFormat=MM/dd/yyyy +DateTimeFormat=MM/dd/yyyy HH:mm Deleted=Deleted Locked=Locked Destroy=Destroy