From 9424135bdeaa792c81ee2435fff019849308dec6 Mon Sep 17 00:00:00 2001 From: David Dykstal Date: Tue, 29 May 2007 14:07:04 +0000 Subject: [PATCH] [183631] fixing date formats & wayward english encoding message --- .../org.eclipse.rse.files.ui/META-INF/MANIFEST.MF | 2 ++ .../rse/internal/files/ui/FileResources.java | 3 +++ .../rse/internal/files/ui/FileResources.properties | 7 ++++++- .../ui/propertypages/SystemFilePropertyPage.java | 13 ++++++++----- .../files/ui/view/SystemViewRemoteFileAdapter.java | 9 +++++---- 5 files changed, 24 insertions(+), 10 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF index d139fe2bd1c..051f6c84525 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF @@ -36,3 +36,5 @@ Export-Package: org.eclipse.rse.files.ui, org.eclipse.rse.internal.files.ui.wizards;x-internal:=true Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Import-Package: com.ibm.icu.lang;version="3.6.1", + com.ibm.icu.text;version="3.6.1" diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/FileResources.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/FileResources.java index 590e182162e..c7032821b1d 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/FileResources.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/FileResources.java @@ -289,6 +289,9 @@ public class FileResources extends NLS public static String ACTION_SELECT_FILE_LABEL; public static String ACTION_SELECT_FILE_TOOLTIP; + // Property Pages + public static String MESSAGE_ENCODING_NOT_SUPPORTED; + static { // load message values from bundle file diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/FileResources.properties b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/FileResources.properties index edada5518ef..5d8266c4d9f 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/FileResources.properties +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/FileResources.properties @@ -287,4 +287,9 @@ ACTION_NEWFOLDER_TOOLTIP=Create a new Folder ACTION_SELECT_DIRECTORY_LABEL=Browse... ACTION_SELECT_DIRECTORY_TOOLTIP=Select folder from remote system ACTION_SELECT_FILE_LABEL=Browse... -ACTION_SELECT_FILE_TOOLTIP=Select file from remote system \ No newline at end of file +ACTION_SELECT_FILE_TOOLTIP=Select file from remote system + +#============================================================= +# Property Pages... +#============================================================= +MESSAGE_ENCODING_NOT_SUPPORTED=The selected encoding is not supported. diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/propertypages/SystemFilePropertyPage.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/propertypages/SystemFilePropertyPage.java index 3f9f7537478..5657c6a2947 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/propertypages/SystemFilePropertyPage.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/propertypages/SystemFilePropertyPage.java @@ -20,14 +20,13 @@ package org.eclipse.rse.internal.files.ui.propertypages; import java.nio.charset.Charset; import java.nio.charset.IllegalCharsetNameException; -import java.text.DateFormat; -import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.events.ISystemResourceChangeEvents; +import org.eclipse.rse.internal.files.ui.FileResources; import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.services.files.RemoteFileIOException; @@ -55,6 +54,8 @@ import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.ui.ide.IDEEncoding; +import com.ibm.icu.text.DateFormat; + /** * The remote property page for remote file properties. @@ -302,7 +303,8 @@ public class SystemFilePropertyPage extends SystemBasePropertyPage clearErrorMessage(); } else { - setErrorMessage("The selected encoding is not supported."); + // TODO make this a SystemMessage + setErrorMessage(FileResources.MESSAGE_ENCODING_NOT_SUPPORTED); } } } @@ -400,8 +402,9 @@ public class SystemFilePropertyPage extends SystemBasePropertyPage Date date = file.getLastModifiedDate(); if (date != null) { - SimpleDateFormat datefmt = (SimpleDateFormat)DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL); - labelModified.setText(datefmt.format(date)); + DateFormat datefmt = DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.FULL); + String formattedDate = datefmt.format(date); + labelModified.setText(formattedDate); } } // readonly diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java index a6aa5192c8e..40ddf172aa5 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java @@ -26,9 +26,7 @@ package org.eclipse.rse.internal.files.ui.view; import java.io.File; -import java.text.DateFormat; import java.text.NumberFormat; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.Iterator; @@ -147,6 +145,8 @@ import org.eclipse.ui.progress.IElementCollector; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.PropertyDescriptor; +import com.ibm.icu.text.DateFormat; + /** * Adapter for displaying remote file system objects in tree views. * These are children of RemoteFileSubSystem filter strings @@ -1201,8 +1201,9 @@ public class SystemViewRemoteFileAdapter { if (formatted) { - SimpleDateFormat datefmt = (SimpleDateFormat) DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.MEDIUM); - return datefmt.format(date); + DateFormat datefmt = DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.MEDIUM); + String formattedDate = datefmt.format(date); + return formattedDate; } else {