From ceb95f567edc02aa6271cf4116bb4f631c82951a Mon Sep 17 00:00:00 2001 From: David McKnight Date: Wed, 6 Feb 2008 18:58:22 +0000 Subject: [PATCH] [216252] [nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible - initial strings moved to where they are used --- .../rse/internal/files/ui/FileResources.java | 71 +++++++++ .../files/ui/FileResources.properties | 58 ++++++++ .../ui/view/SystemViewRemoteFileAdapter.java | 139 +++++++++--------- .../SystemViewRemoteSearchResultAdapter.java | 7 +- .../internal/shells/ui/ShellResources.java | 19 ++- .../shells/ui/ShellResources.properties | 17 ++- .../ui/view/SystemViewRemoteErrorAdapter.java | 7 +- .../view/SystemViewRemoteOutputAdapter.java | 10 +- .../rse/internal/ui/SystemResources.java | 16 +- .../internal/ui/SystemResources.properties | 19 +-- .../internal/ui/view/SystemViewResources.java | 94 +----------- .../ui/view/SystemViewResources.properties | 77 +--------- .../ui/view/SystemViewRootInputAdapter.java | 1 + .../useractions/UserActionsResources.java | 11 ++ .../UserActionsResources.properties | 8 + .../SystemTeamViewCompileCommandAdapter.java | 10 +- .../SystemTeamViewUserActionAdapter.java | 14 +- 17 files changed, 285 insertions(+), 293 deletions(-) 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 80e212d91e2..4ee197fe8c4 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 @@ -14,6 +14,7 @@ * David Dykstal (IBM) - 176488: adding some text for the cache limit checkbox * David McKnight(IBM) - [210142] for accessibility need transfer mode toggle button * David McKnight (IBM) - [209593] [api] add support for "file permissions" and "owner" properties for unix files + * David McKnight (IBM) - [216252] [nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible ********************************************************************************/ package org.eclipse.rse.internal.files.ui; @@ -283,6 +284,76 @@ public class FileResources extends NLS public static String MESSAGE_NOT_SUPPORTED; public static String MESSAGE_GETTING_PERMISSIONS; + public static String RESID_PROPERTY_ARCHIVE_EXPANDEDSIZE_LABEL; + + public static String RESID_PROPERTY_ARCHIVE_EXPANDEDSIZE_VALUE; + public static String RESID_PROPERTY_ARCHIVE_EXPANDEDSIZE_DESCRIPTION; + + public static String RESID_PROPERTY_ARCHIVE_COMMENT_LABEL; + public static String RESID_PROPERTY_ARCHIVE_COMMENT_DESCRIPTION; + + + public static String RESID_PROPERTY_VIRTUALFILE_COMPRESSEDSIZE_LABEL; + public static String RESID_PROPERTY_VIRTUALFILE_COMPRESSEDSIZE_VALUE; + public static String RESID_PROPERTY_VIRTUALFILE_COMPRESSEDSIZE_DESCRIPTION; + + public static String RESID_PROPERTY_VIRTUALFILE_COMMENT_LABEL; + public static String RESID_PROPERTY_VIRTUALFILE_COMMENT_DESCRIPTION; + + public static String RESID_PROPERTY_VIRTUALFILE_COMPRESSIONRATIO_LABEL; + public static String RESID_PROPERTY_VIRTUALFILE_COMPRESSIONRATIO_DESCRIPTION; + + public static String RESID_PROPERTY_VIRTUALFILE_COMPRESSIONMETHOD_LABEL; + public static String RESID_PROPERTY_VIRTUALFILE_COMPRESSIONMETHOD_DESCRIPTION; + + public static String RESID_PROPERTY_FILE_SIZE_VALUE; + + public static String RESID_PROPERTY_FILE_LASTMODIFIED_LABEL; + public static String RESID_PROPERTY_FILE_LASTMODIFIED_TOOLTIP; + + public static String RESID_PROPERTY_FILE_SIZE_LABEL; + public static String RESID_PROPERTY_FILE_SIZE_TOOLTIP; + + public static String RESID_PROPERTY_FILE_CANONICAL_PATH_LABEL; + public static String RESID_PROPERTY_FILE_CANONICAL_PATH_TOOLTIP; + + public static String RESID_PROPERTY_FILE_EXTENSION_LABEL; + public static String RESID_PROPERTY_FILE_EXTENSION_TOOLTIP; + + public static String RESID_PROPERTY_FILE_PERMISSIONS_LABEL; + public static String RESID_PROPERTY_FILE_PERMISSIONS_TOOLTIP; + + public static String RESID_PROPERTY_FILE_OWNER_LABEL; + public static String RESID_PROPERTY_FILE_OWNER_TOOLTIP; + + public static String RESID_PROPERTY_FILE_GROUP_LABEL; + public static String RESID_PROPERTY_FILE_GROUP_TOOLTIP; + + public static String RESID_PROPERTY_FILE_CLASSIFICATION_LABEL; + public static String RESID_PROPERTY_FILE_CLASSIFICATION_TOOLTIP; + + public static String RESID_PROPERTY_FILE_READONLY_LABEL; + public static String RESID_PROPERTY_FILE_READONLY_TOOLTIP; + + public static String RESID_PROPERTY_FILE_READABLE_LABEL; + public static String RESID_PROPERTY_FILE_READABLE_TOOLTIP; + + public static String RESID_PROPERTY_FILE_WRITABLE_LABEL; + public static String RESID_PROPERTY_FILE_WRITABLE_TOOLTIP; + + public static String RESID_PROPERTY_FILE_HIDDEN_LABEL; + public static String RESID_PROPERTY_FILE_HIDDEN_TOOLTIP; + + // search result properties + public static String RESID_PROPERTY_SEARCH_LINE_LABEL; + public static String RESID_PROPERTY_SEARCH_LINE_TOOLTIP; + //public static String RESID_PROPERTY_SEARCH_CHAR_END_LABEL; + //public static String RESID_PROPERTY_SEARCH_CHAR_END_TOOLTIP; + + public static String RESID_PROPERTY_SEARCH_STATUS_ACTIVE_VALUE; + public static String RESID_PROPERTY_SEARCH_STATUS_INACTIVE_VALUE; + + 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 390813fccee..d6a7b5d4b05 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 @@ -14,6 +14,7 @@ # David Dykstal (IBM) - 176488: adding some text for the cache limit checkbox # David McKnight(IBM) - [210142] for accessibility need transfer mode toggle button # David McKnight(IBM) - [209593] [api] add support for "file permissions" and "owner" properties for unix files +# David McKnight (IBM) - [216252] [nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible ################################################################################ # NLS_MESSAGEFORMAT_VAR @@ -284,3 +285,60 @@ MESSAGE_PENDING=Pending... MESSAGE_NOT_SUPPORTED=Not supported MESSAGE_GETTING_PERMISSIONS=Getting permissions for {0} + +#FILE PROPERTIES +RESID_PROPERTY_FILE_LASTMODIFIED_LABEL=Last modified +RESID_PROPERTY_FILE_LASTMODIFIED_TOOLTIP=When last changed +RESID_PROPERTY_FILE_SIZE_LABEL=Size +RESID_PROPERTY_FILE_SIZE_VALUE=&1 bytes +RESID_PROPERTY_FILE_SIZE_TOOLTIP=Number of bytes in this file + +RESID_PROPERTY_FILE_READABLE_LABEL=Readable +RESID_PROPERTY_FILE_READABLE_TOOLTIP=Is this file readable +RESID_PROPERTY_FILE_WRITABLE_LABEL=Writable +RESID_PROPERTY_FILE_WRITABLE_TOOLTIP=Is this file writable +RESID_PROPERTY_FILE_READONLY_LABEL=Read-only +RESID_PROPERTY_FILE_READONLY_TOOLTIP=Is this file read-only +RESID_PROPERTY_FILE_HIDDEN_LABEL=Hidden +RESID_PROPERTY_FILE_HIDDEN_TOOLTIP=Is this file hidden +RESID_PROPERTY_FILE_CANONICAL_PATH_LABEL=Canonical Path +RESID_PROPERTY_FILE_CANONICAL_PATH_TOOLTIP=Canonical path of this file or folder +RESID_PROPERTY_FILE_CLASSIFICATION_LABEL=Classification +RESID_PROPERTY_FILE_CLASSIFICATION_TOOLTIP=Classification path of this file +RESID_PROPERTY_FILE_EXTENSION_LABEL=Extension +RESID_PROPERTY_FILE_EXTENSION_TOOLTIP=Extension of this file + +RESID_PROPERTY_FILE_PERMISSIONS_LABEL=Permissions +RESID_PROPERTY_FILE_PERMISSIONS_TOOLTIP=The user, group and other permissions of this file +RESID_PROPERTY_FILE_OWNER_LABEL=Owner +RESID_PROPERTY_FILE_OWNER_TOOLTIP=The owner of this file +RESID_PROPERTY_FILE_GROUP_LABEL=Group +RESID_PROPERTY_FILE_GROUP_TOOLTIP=The group of this file + + +#SEARCH RESULT PROPERTIES +RESID_PROPERTY_SEARCH_LINE_LABEL=Line +RESID_PROPERTY_SEARCH_LINE_TOOLTIP=Line in file of match + +#ARCHIVE PROPERTIES +RESID_PROPERTY_ARCHIVE_EXPANDEDSIZE_LABEL=Expanded Size +RESID_PROPERTY_ARCHIVE_EXPANDEDSIZE_VALUE=&1 bytes +RESID_PROPERTY_ARCHIVE_EXPANDEDSIZE_DESCRIPTION=Number of bytes in this archive when it is decompressed/expanded +RESID_PROPERTY_ARCHIVE_COMMENT_LABEL=Comment +RESID_PROPERTY_ARCHIVE_COMMENT_DESCRIPTION=The user-defined comment for this archive + + + +#VIRTUAL FILE PROPERTIES +RESID_PROPERTY_VIRTUALFILE_COMPRESSEDSIZE_LABEL=Compressed Size +RESID_PROPERTY_VIRTUALFILE_COMPRESSEDSIZE_VALUE=&1 bytes +RESID_PROPERTY_VIRTUALFILE_COMPRESSEDSIZE_DESCRIPTION=Number of bytes in the file after compression +RESID_PROPERTY_VIRTUALFILE_COMPRESSIONRATIO_LABEL=Compression ratio +RESID_PROPERTY_VIRTUALFILE_COMPRESSIONRATIO_DESCRIPTION=Compressed size divided by expanded size expressed as a percentage +RESID_PROPERTY_VIRTUALFILE_COMPRESSIONMETHOD_LABEL=Compression method +RESID_PROPERTY_VIRTUALFILE_COMPRESSIONMETHOD_DESCRIPTION=The algorithm used to compress the file +RESID_PROPERTY_VIRTUALFILE_COMMENT_LABEL=Comment +RESID_PROPERTY_VIRTUALFILE_COMMENT_DESCRIPTION=The user-defined comment for this virtual file + +RESID_PROPERTY_SEARCH_STATUS_ACTIVE_VALUE=Running +RESID_PROPERTY_SEARCH_STATUS_INACTIVE_VALUE=Finished \ No newline at end of file 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 687582154f3..fe95c7f0a0c 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 @@ -43,6 +43,7 @@ * Xuan Chen (IBM) - [191370] [dstore] Supertransfer zip not deleted when cancelling copy * David McKnight (IBM) - [189873] DownloadJob changed to DownloadAndOpenJob * David McKnight (IBM) - [209593] [api] add support for "file permissions" and "owner" properties for unix files + * David McKnight (IBM) - [216252] [nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible ********************************************************************************/ package org.eclipse.rse.internal.files.ui.view; @@ -233,9 +234,9 @@ public class SystemViewRemoteFileAdapter public SystemViewRemoteFileAdapter() { super(); - xlatedSize = SystemViewResources.RESID_PROPERTY_FILE_SIZE_VALUE; - xlatedCompressedSize = SystemViewResources.RESID_PROPERTY_VIRTUALFILE_COMPRESSEDSIZE_VALUE; - xlatedExpandedSize = SystemViewResources.RESID_PROPERTY_ARCHIVE_EXPANDEDSIZE_VALUE; + xlatedSize = FileResources.RESID_PROPERTY_FILE_SIZE_VALUE; + xlatedCompressedSize = FileResources.RESID_PROPERTY_VIRTUALFILE_COMPRESSEDSIZE_VALUE; + xlatedExpandedSize = FileResources.RESID_PROPERTY_ARCHIVE_EXPANDEDSIZE_VALUE; } @@ -911,44 +912,44 @@ public class SystemViewRemoteFileAdapter //RSEUIPlugin plugin = RSEUIPlugin.getDefault(); // classification - if (isRegular) uniquePropertyDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_CLASSIFICATION, SystemViewResources.RESID_PROPERTY_FILE_CLASSIFICATION_LABEL, SystemViewResources.RESID_PROPERTY_FILE_CLASSIFICATION_TOOLTIP); - else if (isVirtual) uniqueVirtualDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_CLASSIFICATION, SystemViewResources.RESID_PROPERTY_FILE_CLASSIFICATION_LABEL, SystemViewResources.RESID_PROPERTY_FILE_CLASSIFICATION_TOOLTIP); - else if (isArchive) uniqueArchiveDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_CLASSIFICATION, SystemViewResources.RESID_PROPERTY_FILE_CLASSIFICATION_LABEL, SystemViewResources.RESID_PROPERTY_FILE_CLASSIFICATION_TOOLTIP); + if (isRegular) uniquePropertyDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_CLASSIFICATION, FileResources.RESID_PROPERTY_FILE_CLASSIFICATION_LABEL, FileResources.RESID_PROPERTY_FILE_CLASSIFICATION_TOOLTIP); + else if (isVirtual) uniqueVirtualDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_CLASSIFICATION, FileResources.RESID_PROPERTY_FILE_CLASSIFICATION_LABEL, FileResources.RESID_PROPERTY_FILE_CLASSIFICATION_TOOLTIP); + else if (isArchive) uniqueArchiveDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_CLASSIFICATION, FileResources.RESID_PROPERTY_FILE_CLASSIFICATION_LABEL, FileResources.RESID_PROPERTY_FILE_CLASSIFICATION_TOOLTIP); // last modified - if (isRegular) uniquePropertyDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_LASTMODIFIED, SystemViewResources.RESID_PROPERTY_FILE_LASTMODIFIED_LABEL, SystemViewResources.RESID_PROPERTY_FILE_LASTMODIFIED_TOOLTIP); - else if (isVirtual) uniqueVirtualDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_LASTMODIFIED, SystemViewResources.RESID_PROPERTY_FILE_LASTMODIFIED_LABEL, SystemViewResources.RESID_PROPERTY_FILE_LASTMODIFIED_TOOLTIP); - else if (isArchive) uniqueArchiveDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_LASTMODIFIED, SystemViewResources.RESID_PROPERTY_FILE_LASTMODIFIED_LABEL, SystemViewResources.RESID_PROPERTY_FILE_LASTMODIFIED_TOOLTIP); + if (isRegular) uniquePropertyDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_LASTMODIFIED, FileResources.RESID_PROPERTY_FILE_LASTMODIFIED_LABEL, FileResources.RESID_PROPERTY_FILE_LASTMODIFIED_TOOLTIP); + else if (isVirtual) uniqueVirtualDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_LASTMODIFIED, FileResources.RESID_PROPERTY_FILE_LASTMODIFIED_LABEL, FileResources.RESID_PROPERTY_FILE_LASTMODIFIED_TOOLTIP); + else if (isArchive) uniqueArchiveDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_LASTMODIFIED, FileResources.RESID_PROPERTY_FILE_LASTMODIFIED_LABEL, FileResources.RESID_PROPERTY_FILE_LASTMODIFIED_TOOLTIP); // size - if (isRegular) uniquePropertyDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_SIZE, SystemViewResources.RESID_PROPERTY_FILE_SIZE_LABEL, SystemViewResources.RESID_PROPERTY_FILE_SIZE_TOOLTIP); - else if (isVirtual) uniqueVirtualDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_SIZE, SystemViewResources.RESID_PROPERTY_FILE_SIZE_LABEL, SystemViewResources.RESID_PROPERTY_FILE_SIZE_TOOLTIP); - else if (isArchive) uniqueArchiveDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_SIZE, SystemViewResources.RESID_PROPERTY_FILE_SIZE_LABEL, SystemViewResources.RESID_PROPERTY_FILE_SIZE_TOOLTIP); + if (isRegular) uniquePropertyDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_SIZE, FileResources.RESID_PROPERTY_FILE_SIZE_LABEL, FileResources.RESID_PROPERTY_FILE_SIZE_TOOLTIP); + else if (isVirtual) uniqueVirtualDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_SIZE, FileResources.RESID_PROPERTY_FILE_SIZE_LABEL, FileResources.RESID_PROPERTY_FILE_SIZE_TOOLTIP); + else if (isArchive) uniqueArchiveDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_SIZE, FileResources.RESID_PROPERTY_FILE_SIZE_LABEL, FileResources.RESID_PROPERTY_FILE_SIZE_TOOLTIP); // canonical path - if (isRegular) uniquePropertyDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_CANONICAL_PATH, SystemViewResources.RESID_PROPERTY_FILE_CANONICAL_PATH_LABEL, SystemViewResources.RESID_PROPERTY_FILE_CANONICAL_PATH_TOOLTIP); - else if (isVirtual) uniqueVirtualDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_CANONICAL_PATH, SystemViewResources.RESID_PROPERTY_FILE_CANONICAL_PATH_LABEL, SystemViewResources.RESID_PROPERTY_FILE_CANONICAL_PATH_TOOLTIP); - else if (isArchive) uniqueArchiveDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_CANONICAL_PATH, SystemViewResources.RESID_PROPERTY_FILE_CANONICAL_PATH_LABEL, SystemViewResources.RESID_PROPERTY_FILE_CANONICAL_PATH_TOOLTIP); + if (isRegular) uniquePropertyDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_CANONICAL_PATH, FileResources.RESID_PROPERTY_FILE_CANONICAL_PATH_LABEL, FileResources.RESID_PROPERTY_FILE_CANONICAL_PATH_TOOLTIP); + else if (isVirtual) uniqueVirtualDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_CANONICAL_PATH, FileResources.RESID_PROPERTY_FILE_CANONICAL_PATH_LABEL, FileResources.RESID_PROPERTY_FILE_CANONICAL_PATH_TOOLTIP); + else if (isArchive) uniqueArchiveDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_CANONICAL_PATH, FileResources.RESID_PROPERTY_FILE_CANONICAL_PATH_LABEL, FileResources.RESID_PROPERTY_FILE_CANONICAL_PATH_TOOLTIP); // file extension - if (isRegular) uniquePropertyDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_EXTENSION, SystemViewResources.RESID_PROPERTY_FILE_EXTENSION_LABEL, SystemViewResources.RESID_PROPERTY_FILE_EXTENSION_TOOLTIP); - else if (isVirtual) uniqueVirtualDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_EXTENSION, SystemViewResources.RESID_PROPERTY_FILE_EXTENSION_LABEL, SystemViewResources.RESID_PROPERTY_FILE_EXTENSION_TOOLTIP); - else if (isArchive) uniqueArchiveDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_EXTENSION, SystemViewResources.RESID_PROPERTY_FILE_EXTENSION_LABEL, SystemViewResources.RESID_PROPERTY_FILE_EXTENSION_TOOLTIP); + if (isRegular) uniquePropertyDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_EXTENSION, FileResources.RESID_PROPERTY_FILE_EXTENSION_LABEL, FileResources.RESID_PROPERTY_FILE_EXTENSION_TOOLTIP); + else if (isVirtual) uniqueVirtualDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_EXTENSION, FileResources.RESID_PROPERTY_FILE_EXTENSION_LABEL, FileResources.RESID_PROPERTY_FILE_EXTENSION_TOOLTIP); + else if (isArchive) uniqueArchiveDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_EXTENSION, FileResources.RESID_PROPERTY_FILE_EXTENSION_LABEL, FileResources.RESID_PROPERTY_FILE_EXTENSION_TOOLTIP); // file permissions - if (isRegular) uniquePropertyDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_PERMISSIONS, SystemViewResources.RESID_PROPERTY_FILE_PERMISSIONS_LABEL, SystemViewResources.RESID_PROPERTY_FILE_PERMISSIONS_TOOLTIP); - else if (isVirtual) uniqueVirtualDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_PERMISSIONS, SystemViewResources.RESID_PROPERTY_FILE_PERMISSIONS_LABEL, SystemViewResources.RESID_PROPERTY_FILE_PERMISSIONS_TOOLTIP); - else if (isArchive) uniqueArchiveDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_PERMISSIONS, SystemViewResources.RESID_PROPERTY_FILE_PERMISSIONS_LABEL, SystemViewResources.RESID_PROPERTY_FILE_PERMISSIONS_TOOLTIP); + if (isRegular) uniquePropertyDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_PERMISSIONS, FileResources.RESID_PROPERTY_FILE_PERMISSIONS_LABEL, FileResources.RESID_PROPERTY_FILE_PERMISSIONS_TOOLTIP); + else if (isVirtual) uniqueVirtualDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_PERMISSIONS, FileResources.RESID_PROPERTY_FILE_PERMISSIONS_LABEL, FileResources.RESID_PROPERTY_FILE_PERMISSIONS_TOOLTIP); + else if (isArchive) uniqueArchiveDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_PERMISSIONS, FileResources.RESID_PROPERTY_FILE_PERMISSIONS_LABEL, FileResources.RESID_PROPERTY_FILE_PERMISSIONS_TOOLTIP); // file owner - if (isRegular) uniquePropertyDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_OWNER, SystemViewResources.RESID_PROPERTY_FILE_OWNER_LABEL, SystemViewResources.RESID_PROPERTY_FILE_OWNER_TOOLTIP); - else if (isVirtual) uniqueVirtualDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_OWNER, SystemViewResources.RESID_PROPERTY_FILE_OWNER_LABEL, SystemViewResources.RESID_PROPERTY_FILE_OWNER_TOOLTIP); - else if (isArchive) uniqueArchiveDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_OWNER, SystemViewResources.RESID_PROPERTY_FILE_OWNER_LABEL, SystemViewResources.RESID_PROPERTY_FILE_OWNER_TOOLTIP); + if (isRegular) uniquePropertyDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_OWNER, FileResources.RESID_PROPERTY_FILE_OWNER_LABEL, FileResources.RESID_PROPERTY_FILE_OWNER_TOOLTIP); + else if (isVirtual) uniqueVirtualDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_OWNER, FileResources.RESID_PROPERTY_FILE_OWNER_LABEL, FileResources.RESID_PROPERTY_FILE_OWNER_TOOLTIP); + else if (isArchive) uniqueArchiveDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_OWNER, FileResources.RESID_PROPERTY_FILE_OWNER_LABEL, FileResources.RESID_PROPERTY_FILE_OWNER_TOOLTIP); // file group - if (isRegular) uniquePropertyDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_GROUP, SystemViewResources.RESID_PROPERTY_FILE_GROUP_LABEL, SystemViewResources.RESID_PROPERTY_FILE_GROUP_TOOLTIP); - else if (isVirtual) uniqueVirtualDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_GROUP, SystemViewResources.RESID_PROPERTY_FILE_GROUP_LABEL, SystemViewResources.RESID_PROPERTY_FILE_GROUP_TOOLTIP); - else if (isArchive) uniqueArchiveDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_GROUP, SystemViewResources.RESID_PROPERTY_FILE_GROUP_LABEL, SystemViewResources.RESID_PROPERTY_FILE_GROUP_TOOLTIP); + if (isRegular) uniquePropertyDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_GROUP, FileResources.RESID_PROPERTY_FILE_GROUP_LABEL, FileResources.RESID_PROPERTY_FILE_GROUP_TOOLTIP); + else if (isVirtual) uniqueVirtualDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_GROUP, FileResources.RESID_PROPERTY_FILE_GROUP_LABEL, FileResources.RESID_PROPERTY_FILE_GROUP_TOOLTIP); + else if (isArchive) uniqueArchiveDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_GROUP, FileResources.RESID_PROPERTY_FILE_GROUP_LABEL, FileResources.RESID_PROPERTY_FILE_GROUP_TOOLTIP); if (isVirtual) @@ -956,26 +957,26 @@ public class SystemViewRemoteFileAdapter // add virtual property descriptors... // compressed size - uniqueVirtualDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_VIRTUAL_COMPRESSEDSIZE, SystemViewResources.RESID_PROPERTY_VIRTUALFILE_COMPRESSEDSIZE_LABEL, SystemViewResources.RESID_PROPERTY_VIRTUALFILE_COMPRESSEDSIZE_DESCRIPTION); + uniqueVirtualDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_VIRTUAL_COMPRESSEDSIZE, FileResources.RESID_PROPERTY_VIRTUALFILE_COMPRESSEDSIZE_LABEL, FileResources.RESID_PROPERTY_VIRTUALFILE_COMPRESSEDSIZE_DESCRIPTION); // compression ratio - uniqueVirtualDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_VIRTUAL_COMPRESSIONRATIO, SystemViewResources.RESID_PROPERTY_VIRTUALFILE_COMPRESSIONRATIO_LABEL, SystemViewResources.RESID_PROPERTY_VIRTUALFILE_COMPRESSIONRATIO_DESCRIPTION); + uniqueVirtualDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_VIRTUAL_COMPRESSIONRATIO, FileResources.RESID_PROPERTY_VIRTUALFILE_COMPRESSIONRATIO_LABEL, FileResources.RESID_PROPERTY_VIRTUALFILE_COMPRESSIONRATIO_DESCRIPTION); // compression method - uniqueVirtualDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_VIRTUAL_COMPRESSIONMETHOD, SystemViewResources.RESID_PROPERTY_VIRTUALFILE_COMPRESSIONMETHOD_LABEL, SystemViewResources.RESID_PROPERTY_VIRTUALFILE_COMPRESSIONMETHOD_DESCRIPTION); + uniqueVirtualDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_VIRTUAL_COMPRESSIONMETHOD, FileResources.RESID_PROPERTY_VIRTUALFILE_COMPRESSIONMETHOD_LABEL, FileResources.RESID_PROPERTY_VIRTUALFILE_COMPRESSIONMETHOD_DESCRIPTION); // comment - uniqueVirtualDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_VIRTUAL_COMMENT, SystemViewResources.RESID_PROPERTY_VIRTUALFILE_COMMENT_LABEL, SystemViewResources.RESID_PROPERTY_VIRTUALFILE_COMMENT_DESCRIPTION); + uniqueVirtualDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_VIRTUAL_COMMENT, FileResources.RESID_PROPERTY_VIRTUALFILE_COMMENT_LABEL, FileResources.RESID_PROPERTY_VIRTUALFILE_COMMENT_DESCRIPTION); } else if (isArchive) { // add archive property descriptors... // expanded size - uniqueArchiveDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_ARCHIVE_EXPANDEDSIZE, SystemViewResources.RESID_PROPERTY_ARCHIVE_EXPANDEDSIZE_LABEL, SystemViewResources.RESID_PROPERTY_ARCHIVE_EXPANDEDSIZE_DESCRIPTION); + uniqueArchiveDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_ARCHIVE_EXPANDEDSIZE, FileResources.RESID_PROPERTY_ARCHIVE_EXPANDEDSIZE_LABEL, FileResources.RESID_PROPERTY_ARCHIVE_EXPANDEDSIZE_DESCRIPTION); // comment - uniqueArchiveDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_ARCHIVE_COMMENT, SystemViewResources.RESID_PROPERTY_ARCHIVE_COMMENT_LABEL, SystemViewResources.RESID_PROPERTY_ARCHIVE_COMMENT_DESCRIPTION); + uniqueArchiveDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_ARCHIVE_COMMENT, FileResources.RESID_PROPERTY_ARCHIVE_COMMENT_LABEL, FileResources.RESID_PROPERTY_ARCHIVE_COMMENT_DESCRIPTION); } } @@ -1043,54 +1044,54 @@ public class SystemViewRemoteFileAdapter briefPropertyDescriptorArray[++briefIdx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILTERSTRING, SystemViewResources.RESID_PROPERTY_FILTERSTRING_LABEL,SystemViewResources.RESID_PROPERTY_FILTERSTRING_TOOLTIP); // canonical path - if (isRegular) propertyDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_CANONICAL_PATH, SystemViewResources.RESID_PROPERTY_FILE_CANONICAL_PATH_LABEL,SystemViewResources.RESID_PROPERTY_FILE_CANONICAL_PATH_TOOLTIP); - else if (isVirtual) virtualDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_CANONICAL_PATH, SystemViewResources.RESID_PROPERTY_FILE_CANONICAL_PATH_LABEL,SystemViewResources.RESID_PROPERTY_FILE_CANONICAL_PATH_TOOLTIP); - else if (isArchive) archiveDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_CANONICAL_PATH, SystemViewResources.RESID_PROPERTY_FILE_CANONICAL_PATH_LABEL,SystemViewResources.RESID_PROPERTY_FILE_CANONICAL_PATH_TOOLTIP); + if (isRegular) propertyDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_CANONICAL_PATH, FileResources.RESID_PROPERTY_FILE_CANONICAL_PATH_LABEL,FileResources.RESID_PROPERTY_FILE_CANONICAL_PATH_TOOLTIP); + else if (isVirtual) virtualDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_CANONICAL_PATH, FileResources.RESID_PROPERTY_FILE_CANONICAL_PATH_LABEL,FileResources.RESID_PROPERTY_FILE_CANONICAL_PATH_TOOLTIP); + else if (isArchive) archiveDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_CANONICAL_PATH, FileResources.RESID_PROPERTY_FILE_CANONICAL_PATH_LABEL,FileResources.RESID_PROPERTY_FILE_CANONICAL_PATH_TOOLTIP); // last modified - if (isRegular) propertyDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_LASTMODIFIED, SystemViewResources.RESID_PROPERTY_FILE_LASTMODIFIED_LABEL, SystemViewResources.RESID_PROPERTY_FILE_LASTMODIFIED_TOOLTIP); - else if (isVirtual) virtualDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_LASTMODIFIED, SystemViewResources.RESID_PROPERTY_FILE_LASTMODIFIED_LABEL,SystemViewResources.RESID_PROPERTY_FILE_LASTMODIFIED_TOOLTIP); - else if (isArchive) archiveDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_LASTMODIFIED, SystemViewResources.RESID_PROPERTY_FILE_LASTMODIFIED_LABEL,SystemViewResources.RESID_PROPERTY_FILE_LASTMODIFIED_TOOLTIP); + if (isRegular) propertyDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_LASTMODIFIED, FileResources.RESID_PROPERTY_FILE_LASTMODIFIED_LABEL, FileResources.RESID_PROPERTY_FILE_LASTMODIFIED_TOOLTIP); + else if (isVirtual) virtualDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_LASTMODIFIED, FileResources.RESID_PROPERTY_FILE_LASTMODIFIED_LABEL,FileResources.RESID_PROPERTY_FILE_LASTMODIFIED_TOOLTIP); + else if (isArchive) archiveDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_LASTMODIFIED, FileResources.RESID_PROPERTY_FILE_LASTMODIFIED_LABEL,FileResources.RESID_PROPERTY_FILE_LASTMODIFIED_TOOLTIP); // size - if (isRegular) propertyDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_SIZE, SystemViewResources.RESID_PROPERTY_FILE_SIZE_LABEL, SystemViewResources.RESID_PROPERTY_FILE_SIZE_TOOLTIP); - else if (isVirtual) virtualDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_SIZE, SystemViewResources.RESID_PROPERTY_FILE_SIZE_LABEL, SystemViewResources.RESID_PROPERTY_FILE_SIZE_TOOLTIP); - else if (isArchive) archiveDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_SIZE, SystemViewResources.RESID_PROPERTY_FILE_SIZE_LABEL, SystemViewResources.RESID_PROPERTY_FILE_SIZE_TOOLTIP); + if (isRegular) propertyDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_SIZE, FileResources.RESID_PROPERTY_FILE_SIZE_LABEL, FileResources.RESID_PROPERTY_FILE_SIZE_TOOLTIP); + else if (isVirtual) virtualDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_SIZE, FileResources.RESID_PROPERTY_FILE_SIZE_LABEL, FileResources.RESID_PROPERTY_FILE_SIZE_TOOLTIP); + else if (isArchive) archiveDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_SIZE, FileResources.RESID_PROPERTY_FILE_SIZE_LABEL, FileResources.RESID_PROPERTY_FILE_SIZE_TOOLTIP); // classification - if (isRegular) propertyDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_CLASSIFICATION, SystemViewResources.RESID_PROPERTY_FILE_CLASSIFICATION_LABEL, SystemViewResources.RESID_PROPERTY_FILE_CLASSIFICATION_TOOLTIP); - else if (isVirtual) virtualDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_CLASSIFICATION, SystemViewResources.RESID_PROPERTY_FILE_CLASSIFICATION_LABEL, SystemViewResources.RESID_PROPERTY_FILE_CLASSIFICATION_TOOLTIP); - else if (isArchive) archiveDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_CLASSIFICATION, SystemViewResources.RESID_PROPERTY_FILE_CLASSIFICATION_LABEL, SystemViewResources.RESID_PROPERTY_FILE_CLASSIFICATION_TOOLTIP); + if (isRegular) propertyDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_CLASSIFICATION, FileResources.RESID_PROPERTY_FILE_CLASSIFICATION_LABEL, FileResources.RESID_PROPERTY_FILE_CLASSIFICATION_TOOLTIP); + else if (isVirtual) virtualDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_CLASSIFICATION, FileResources.RESID_PROPERTY_FILE_CLASSIFICATION_LABEL, FileResources.RESID_PROPERTY_FILE_CLASSIFICATION_TOOLTIP); + else if (isArchive) archiveDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_CLASSIFICATION, FileResources.RESID_PROPERTY_FILE_CLASSIFICATION_LABEL, FileResources.RESID_PROPERTY_FILE_CLASSIFICATION_TOOLTIP); // readonly - if (isRegular) propertyDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_READONLY, SystemViewResources.RESID_PROPERTY_FILE_READONLY_LABEL, SystemViewResources.RESID_PROPERTY_FILE_READONLY_TOOLTIP); - else if (isVirtual) virtualDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_READONLY, SystemViewResources.RESID_PROPERTY_FILE_READONLY_LABEL, SystemViewResources.RESID_PROPERTY_FILE_READONLY_TOOLTIP); - else if (isArchive) archiveDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_READONLY, SystemViewResources.RESID_PROPERTY_FILE_READONLY_LABEL, SystemViewResources.RESID_PROPERTY_FILE_READONLY_TOOLTIP); + if (isRegular) propertyDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_READONLY, FileResources.RESID_PROPERTY_FILE_READONLY_LABEL, FileResources.RESID_PROPERTY_FILE_READONLY_TOOLTIP); + else if (isVirtual) virtualDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_READONLY, FileResources.RESID_PROPERTY_FILE_READONLY_LABEL, FileResources.RESID_PROPERTY_FILE_READONLY_TOOLTIP); + else if (isArchive) archiveDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_READONLY, FileResources.RESID_PROPERTY_FILE_READONLY_LABEL, FileResources.RESID_PROPERTY_FILE_READONLY_TOOLTIP); // hidden - if (isRegular) propertyDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_HIDDEN, SystemViewResources.RESID_PROPERTY_FILE_HIDDEN_LABEL, SystemViewResources.RESID_PROPERTY_FILE_HIDDEN_TOOLTIP); - else if (isVirtual) virtualDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_HIDDEN, SystemViewResources.RESID_PROPERTY_FILE_HIDDEN_LABEL, SystemViewResources.RESID_PROPERTY_FILE_HIDDEN_TOOLTIP); - else if (isArchive) archiveDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_HIDDEN, SystemViewResources.RESID_PROPERTY_FILE_HIDDEN_LABEL, SystemViewResources.RESID_PROPERTY_FILE_HIDDEN_TOOLTIP); + if (isRegular) propertyDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_HIDDEN, FileResources.RESID_PROPERTY_FILE_HIDDEN_LABEL, FileResources.RESID_PROPERTY_FILE_HIDDEN_TOOLTIP); + else if (isVirtual) virtualDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_HIDDEN, FileResources.RESID_PROPERTY_FILE_HIDDEN_LABEL, FileResources.RESID_PROPERTY_FILE_HIDDEN_TOOLTIP); + else if (isArchive) archiveDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_HIDDEN, FileResources.RESID_PROPERTY_FILE_HIDDEN_LABEL, FileResources.RESID_PROPERTY_FILE_HIDDEN_TOOLTIP); // file extension - if (isRegular) propertyDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_EXTENSION, SystemViewResources.RESID_PROPERTY_FILE_EXTENSION_LABEL, SystemViewResources.RESID_PROPERTY_FILE_EXTENSION_TOOLTIP); - else if (isVirtual) virtualDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_EXTENSION, SystemViewResources.RESID_PROPERTY_FILE_EXTENSION_LABEL, SystemViewResources.RESID_PROPERTY_FILE_EXTENSION_TOOLTIP); - else if (isArchive) archiveDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_EXTENSION, SystemViewResources.RESID_PROPERTY_FILE_EXTENSION_LABEL, SystemViewResources.RESID_PROPERTY_FILE_EXTENSION_TOOLTIP); + if (isRegular) propertyDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_EXTENSION, FileResources.RESID_PROPERTY_FILE_EXTENSION_LABEL, FileResources.RESID_PROPERTY_FILE_EXTENSION_TOOLTIP); + else if (isVirtual) virtualDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_EXTENSION, FileResources.RESID_PROPERTY_FILE_EXTENSION_LABEL, FileResources.RESID_PROPERTY_FILE_EXTENSION_TOOLTIP); + else if (isArchive) archiveDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_EXTENSION, FileResources.RESID_PROPERTY_FILE_EXTENSION_LABEL, FileResources.RESID_PROPERTY_FILE_EXTENSION_TOOLTIP); // file permissions - if (isRegular) propertyDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_PERMISSIONS, SystemViewResources.RESID_PROPERTY_FILE_PERMISSIONS_LABEL, SystemViewResources.RESID_PROPERTY_FILE_PERMISSIONS_TOOLTIP); - else if (isVirtual) virtualDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_PERMISSIONS, SystemViewResources.RESID_PROPERTY_FILE_PERMISSIONS_LABEL, SystemViewResources.RESID_PROPERTY_FILE_PERMISSIONS_TOOLTIP); - else if (isArchive) archiveDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_PERMISSIONS, SystemViewResources.RESID_PROPERTY_FILE_PERMISSIONS_LABEL, SystemViewResources.RESID_PROPERTY_FILE_PERMISSIONS_TOOLTIP); + if (isRegular) propertyDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_PERMISSIONS, FileResources.RESID_PROPERTY_FILE_PERMISSIONS_LABEL, FileResources.RESID_PROPERTY_FILE_PERMISSIONS_TOOLTIP); + else if (isVirtual) virtualDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_PERMISSIONS, FileResources.RESID_PROPERTY_FILE_PERMISSIONS_LABEL, FileResources.RESID_PROPERTY_FILE_PERMISSIONS_TOOLTIP); + else if (isArchive) archiveDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_PERMISSIONS, FileResources.RESID_PROPERTY_FILE_PERMISSIONS_LABEL, FileResources.RESID_PROPERTY_FILE_PERMISSIONS_TOOLTIP); // file owner - if (isRegular) propertyDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_OWNER, SystemViewResources.RESID_PROPERTY_FILE_OWNER_LABEL, SystemViewResources.RESID_PROPERTY_FILE_OWNER_TOOLTIP); - else if (isVirtual) virtualDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_OWNER, SystemViewResources.RESID_PROPERTY_FILE_OWNER_LABEL, SystemViewResources.RESID_PROPERTY_FILE_OWNER_TOOLTIP); - else if (isArchive) archiveDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_OWNER, SystemViewResources.RESID_PROPERTY_FILE_OWNER_LABEL, SystemViewResources.RESID_PROPERTY_FILE_OWNER_TOOLTIP); + if (isRegular) propertyDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_OWNER, FileResources.RESID_PROPERTY_FILE_OWNER_LABEL, FileResources.RESID_PROPERTY_FILE_OWNER_TOOLTIP); + else if (isVirtual) virtualDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_OWNER, FileResources.RESID_PROPERTY_FILE_OWNER_LABEL, FileResources.RESID_PROPERTY_FILE_OWNER_TOOLTIP); + else if (isArchive) archiveDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_OWNER, FileResources.RESID_PROPERTY_FILE_OWNER_LABEL, FileResources.RESID_PROPERTY_FILE_OWNER_TOOLTIP); // file group - if (isRegular) propertyDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_GROUP, SystemViewResources.RESID_PROPERTY_FILE_GROUP_LABEL, SystemViewResources.RESID_PROPERTY_FILE_GROUP_TOOLTIP); - else if (isVirtual) virtualDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_GROUP, SystemViewResources.RESID_PROPERTY_FILE_GROUP_LABEL, SystemViewResources.RESID_PROPERTY_FILE_GROUP_TOOLTIP); - else if (isArchive) archiveDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_GROUP, SystemViewResources.RESID_PROPERTY_FILE_GROUP_LABEL, SystemViewResources.RESID_PROPERTY_FILE_GROUP_TOOLTIP); + if (isRegular) propertyDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_GROUP, FileResources.RESID_PROPERTY_FILE_GROUP_LABEL, FileResources.RESID_PROPERTY_FILE_GROUP_TOOLTIP); + else if (isVirtual) virtualDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_GROUP, FileResources.RESID_PROPERTY_FILE_GROUP_LABEL, FileResources.RESID_PROPERTY_FILE_GROUP_TOOLTIP); + else if (isArchive) archiveDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_GROUP, FileResources.RESID_PROPERTY_FILE_GROUP_LABEL, FileResources.RESID_PROPERTY_FILE_GROUP_TOOLTIP); if (debug) @@ -1116,16 +1117,16 @@ public class SystemViewRemoteFileAdapter // add virtual property descriptors... // compressed size - virtualDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_VIRTUAL_COMPRESSEDSIZE, SystemViewResources.RESID_PROPERTY_VIRTUALFILE_COMPRESSEDSIZE_LABEL, SystemViewResources.RESID_PROPERTY_VIRTUALFILE_COMPRESSEDSIZE_DESCRIPTION); + virtualDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_VIRTUAL_COMPRESSEDSIZE, FileResources.RESID_PROPERTY_VIRTUALFILE_COMPRESSEDSIZE_LABEL, FileResources.RESID_PROPERTY_VIRTUALFILE_COMPRESSEDSIZE_DESCRIPTION); // compression ratio - virtualDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_VIRTUAL_COMPRESSIONRATIO, SystemViewResources.RESID_PROPERTY_VIRTUALFILE_COMPRESSIONRATIO_LABEL, SystemViewResources.RESID_PROPERTY_VIRTUALFILE_COMPRESSIONRATIO_DESCRIPTION); + virtualDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_VIRTUAL_COMPRESSIONRATIO, FileResources.RESID_PROPERTY_VIRTUALFILE_COMPRESSIONRATIO_LABEL, FileResources.RESID_PROPERTY_VIRTUALFILE_COMPRESSIONRATIO_DESCRIPTION); // compression method - virtualDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_VIRTUAL_COMPRESSIONMETHOD, SystemViewResources.RESID_PROPERTY_VIRTUALFILE_COMPRESSIONMETHOD_LABEL, SystemViewResources.RESID_PROPERTY_VIRTUALFILE_COMPRESSIONMETHOD_DESCRIPTION); + virtualDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_VIRTUAL_COMPRESSIONMETHOD, FileResources.RESID_PROPERTY_VIRTUALFILE_COMPRESSIONMETHOD_LABEL, FileResources.RESID_PROPERTY_VIRTUALFILE_COMPRESSIONMETHOD_DESCRIPTION); // comment - virtualDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_VIRTUAL_COMMENT, SystemViewResources.RESID_PROPERTY_VIRTUALFILE_COMMENT_LABEL, SystemViewResources.RESID_PROPERTY_VIRTUALFILE_COMMENT_DESCRIPTION); + virtualDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_VIRTUAL_COMMENT, FileResources.RESID_PROPERTY_VIRTUALFILE_COMMENT_LABEL, FileResources.RESID_PROPERTY_VIRTUALFILE_COMMENT_DESCRIPTION); } else if (isArchive) @@ -1133,10 +1134,10 @@ public class SystemViewRemoteFileAdapter // add archive property descriptors... // expanded size - archiveDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_ARCHIVE_EXPANDEDSIZE, SystemViewResources.RESID_PROPERTY_ARCHIVE_EXPANDEDSIZE_LABEL, SystemViewResources.RESID_PROPERTY_ARCHIVE_EXPANDEDSIZE_DESCRIPTION); + archiveDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_ARCHIVE_EXPANDEDSIZE, FileResources.RESID_PROPERTY_ARCHIVE_EXPANDEDSIZE_LABEL, FileResources.RESID_PROPERTY_ARCHIVE_EXPANDEDSIZE_DESCRIPTION); // comment - archiveDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_ARCHIVE_COMMENT, SystemViewResources.RESID_PROPERTY_ARCHIVE_COMMENT_LABEL, SystemViewResources.RESID_PROPERTY_ARCHIVE_COMMENT_DESCRIPTION); + archiveDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_ARCHIVE_COMMENT, FileResources.RESID_PROPERTY_ARCHIVE_COMMENT_LABEL, FileResources.RESID_PROPERTY_ARCHIVE_COMMENT_DESCRIPTION); } } diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteSearchResultAdapter.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteSearchResultAdapter.java index b21bcfaa570..2f77357430d 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteSearchResultAdapter.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteSearchResultAdapter.java @@ -17,6 +17,7 @@ * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry * Martin Oberhuber (Wind River) - [189130] Move SystemIFileProperties from UI to Core + * David McKnight (IBM) - [216252] [nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible ********************************************************************************/ package org.eclipse.rse.internal.files.ui.view; @@ -515,7 +516,7 @@ public class SystemViewRemoteSearchResultAdapter extends AbstractSystemViewAdapt _propertyDescriptors[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_FILE_PATH, SystemViewResources.RESID_PROPERTY_FILE_PATH_LABEL, SystemViewResources.RESID_PROPERTY_FILE_PATH_TOOLTIP); // char start - _propertyDescriptors[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_SEARCH_LINE, SystemViewResources.RESID_PROPERTY_SEARCH_LINE_LABEL, SystemViewResources.RESID_PROPERTY_SEARCH_LINE_TOOLTIP); + _propertyDescriptors[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_SEARCH_LINE, FileResources.RESID_PROPERTY_SEARCH_LINE_LABEL, FileResources.RESID_PROPERTY_SEARCH_LINE_TOOLTIP); //_propertyDescriptors[++idx] = createSimplePropertyDescriptor(P_SEARCH_CHAR_END, SystemViewResources.RESID_PROPERTY_SEARCH_CHAR_END_ROOT); } return _propertyDescriptors; @@ -802,11 +803,11 @@ public class SystemViewRemoteSearchResultAdapter extends AbstractSystemViewAdapt { if (cmdShell.isActive()) { - return SystemViewResources.RESID_PROPERTY_SHELL_STATUS_ACTIVE_VALUE; + return FileResources.RESID_PROPERTY_SEARCH_STATUS_ACTIVE_VALUE; } else { - return SystemViewResources.RESID_PROPERTY_SHELL_STATUS_INACTIVE_VALUE; + return FileResources.RESID_PROPERTY_SEARCH_STATUS_INACTIVE_VALUE; } } else if (name.equals(ISystemPropertyConstants.P_SHELL_CONTEXT)) diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/ShellResources.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/ShellResources.java index fde24d56b1b..bafd3957991 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/ShellResources.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/ShellResources.java @@ -12,7 +12,7 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * David McKnight (IBM) - [216252] [nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible *******************************************************************************/ package org.eclipse.rse.internal.shells.ui; @@ -70,6 +70,23 @@ public class ShellResources extends NLS public static String ACTION_OPEN_OUTPUT_LABEL; public static String ACTION_OPEN_OUTPUT_TOOLTIP; + + // error properties + public static String RESID_PROPERTY_ERROR_FILENAME_LABEL; + public static String RESID_PROPERTY_ERROR_FILENAME_TOOLTIP; + + public static String RESID_PROPERTY_ERROR_LINENO_LABEL; + public static String RESID_PROPERTY_ERROR_LINENO_TOOLTIP; + + // shell status properties + public static String RESID_PROPERTY_SHELL_STATUS_LABEL; + public static String RESID_PROPERTY_SHELL_STATUS_TOOLTIP; + public static String RESID_PROPERTY_SHELL_CONTEXT_LABEL; + public static String RESID_PROPERTY_SHELL_CONTEXT_TOOLTIP; + + public static String RESID_PROPERTY_SHELL_STATUS_ACTIVE_VALUE; + public static String RESID_PROPERTY_SHELL_STATUS_INACTIVE_VALUE; + static { diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/ShellResources.properties b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/ShellResources.properties index 3bece9eaaeb..6a1cd0dd70b 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/ShellResources.properties +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/ShellResources.properties @@ -12,7 +12,7 @@ # Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. # # Contributors: -# {Name} (company) - description of contribution. +# David McKnight (IBM) - [216252] [nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible ############################################################################### # NLS_MESSAGEFORMAT_VAR @@ -74,3 +74,18 @@ ACTION_EXPORT_SHELL_HISTORY_TOOLTIP=Export the command history for the selected ACTION_OPEN_OUTPUT_LABEL= Goto ACTION_OPEN_OUTPUT_TOOLTIP= Open the selected output object in an editor or view + +#ERROR PROPERTIES +RESID_PROPERTY_ERROR_FILENAME_LABEL=File +RESID_PROPERTY_ERROR_FILENAME_TOOLTIP=File Containing Error +RESID_PROPERTY_ERROR_LINENO_LABEL=Line +RESID_PROPERTY_ERROR_LINENO_TOOLTIP=Line number + +#SHELL PROPERTIES +RESID_PROPERTY_SHELL_STATUS_LABEL=Status +RESID_PROPERTY_SHELL_STATUS_TOOLTIP=Status of the shell +RESID_PROPERTY_SHELL_CONTEXT_LABEL=Context +RESID_PROPERTY_SHELL_CONTEXT_TOOLTIP=Current context within the shell +RESID_PROPERTY_SHELL_STATUS_ACTIVE_VALUE=Running +RESID_PROPERTY_SHELL_STATUS_INACTIVE_VALUE=Finished + diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/SystemViewRemoteErrorAdapter.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/SystemViewRemoteErrorAdapter.java index bfefd548294..4f28592afe4 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/SystemViewRemoteErrorAdapter.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/SystemViewRemoteErrorAdapter.java @@ -12,12 +12,13 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * David McKnight (IBM) - [216252] [nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible *******************************************************************************/ package org.eclipse.rse.internal.shells.ui.view; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.rse.internal.shells.ui.ShellResources; import org.eclipse.rse.internal.ui.view.SystemViewResources; import org.eclipse.rse.shells.ui.view.SystemViewRemoteOutputAdapter; import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteError; @@ -59,10 +60,10 @@ public class SystemViewRemoteErrorAdapter extends SystemViewRemoteOutputAdapter //RSEUIPlugin plugin = RSEUIPlugin.getDefault(); // path - _uniquePropertyDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_ERROR_FILENAME, SystemViewResources.RESID_PROPERTY_ERROR_FILENAME_LABEL, SystemViewResources.RESID_PROPERTY_ERROR_FILENAME_TOOLTIP); + _uniquePropertyDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_ERROR_FILENAME, ShellResources.RESID_PROPERTY_ERROR_FILENAME_LABEL, ShellResources.RESID_PROPERTY_ERROR_FILENAME_TOOLTIP); // line - _uniquePropertyDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_ERROR_LINENO, SystemViewResources.RESID_PROPERTY_ERROR_LINENO_LABEL, SystemViewResources.RESID_PROPERTY_ERROR_LINENO_TOOLTIP); + _uniquePropertyDescriptorArray[++i] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_ERROR_LINENO, ShellResources.RESID_PROPERTY_ERROR_LINENO_LABEL, ShellResources.RESID_PROPERTY_ERROR_LINENO_TOOLTIP); } return _uniquePropertyDescriptorArray; diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemViewRemoteOutputAdapter.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemViewRemoteOutputAdapter.java index 4ea836b3dce..d20aed381e4 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemViewRemoteOutputAdapter.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemViewRemoteOutputAdapter.java @@ -22,6 +22,7 @@ * David McKnight (IBM) - [196842] Don't have open menu for folders * Xuan Chen (IBM) - [160775] [api] rename (at least within a zip) blocks UI thread * David McKnight (IBM) - [189873] Improve remote shell editor open action with background jobs + * David McKnight (IBM) - [216252] [nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible ********************************************************************************/ package org.eclipse.rse.shells.ui.view; @@ -53,7 +54,6 @@ import org.eclipse.rse.internal.shells.ui.view.ShellServiceSubSystemConfiguratio import org.eclipse.rse.internal.shells.ui.view.SystemCommandsUI; import org.eclipse.rse.internal.shells.ui.view.SystemCommandsViewPart; import org.eclipse.rse.internal.ui.view.SystemView; -import org.eclipse.rse.internal.ui.view.SystemViewResources; import org.eclipse.rse.subsystems.files.core.SystemIFileProperties; import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; @@ -1081,8 +1081,8 @@ implements ISystemViewElementAdapter, ISystemRemoteElementAdapter { _shellPropertyDescriptors = new IPropertyDescriptor[2]; - _shellPropertyDescriptors[0] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_SHELL_STATUS, SystemViewResources.RESID_PROPERTY_SHELL_STATUS_LABEL, SystemViewResources.RESID_PROPERTY_SHELL_STATUS_TOOLTIP); - _shellPropertyDescriptors[1] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_SHELL_CONTEXT, SystemViewResources.RESID_PROPERTY_SHELL_CONTEXT_LABEL, SystemViewResources.RESID_PROPERTY_SHELL_CONTEXT_TOOLTIP); + _shellPropertyDescriptors[0] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_SHELL_STATUS, ShellResources.RESID_PROPERTY_SHELL_STATUS_LABEL, ShellResources.RESID_PROPERTY_SHELL_STATUS_TOOLTIP); + _shellPropertyDescriptors[1] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_SHELL_CONTEXT, ShellResources.RESID_PROPERTY_SHELL_CONTEXT_LABEL, ShellResources.RESID_PROPERTY_SHELL_CONTEXT_TOOLTIP); } return _shellPropertyDescriptors; } @@ -1113,11 +1113,11 @@ implements ISystemViewElementAdapter, ISystemRemoteElementAdapter { if (cmdShell.isActive()) { - return SystemViewResources.RESID_PROPERTY_SHELL_STATUS_ACTIVE_VALUE; + return ShellResources.RESID_PROPERTY_SHELL_STATUS_ACTIVE_VALUE; } else { - return SystemViewResources.RESID_PROPERTY_SHELL_STATUS_INACTIVE_VALUE; + return ShellResources.RESID_PROPERTY_SHELL_STATUS_INACTIVE_VALUE; } } else if (name.equals(ISystemPropertyConstants.P_SHELL_CONTEXT)) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResources.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResources.java index 275e47ccd86..ae643bcd7ba 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResources.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResources.java @@ -14,6 +14,7 @@ * Martin Oberhuber (Wind River) - [181066] NLS missing messages with DAEMON and Shells * Martin Oberhuber (Wind River) - [185552] Remove remoteSystemsViewPreferencesActions extension point * David McKnight (IBM) - [210229] table refresh needs unique table-specific tooltip-text + * David McKnight (IBM) - [216252] [nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible ********************************************************************************/ package org.eclipse.rse.internal.ui; @@ -813,11 +814,6 @@ public class SystemResources extends NLS public static String ACTION_RENAME_LABEL; public static String ACTION_RENAME_TOOLTIP; - public static String ACTION_IMPORT_TO_PROJECT_LABEL; - public static String ACTION_IMPORT_TO_PROJECT_TOOLTIP; - - public static String ACTION_EXPORT_FROM_PROJECT_LABEL; - public static String ACTION_EXPORT_FROM_PROJECT_TOOLTIP; public static String ACTION_NEWFILE_LABEL; public static String ACTION_NEWFILE_TOOLTIP; @@ -1100,15 +1096,9 @@ public class SystemResources extends NLS public static String ACTION_ERROR_LIST_LABEL; public static String ACTION_ERROR_LIST_TOOLTIP; - public static String ACTION_FIND_FILES_LABEL; - public static String ACTION_FIND_FILES_TOOLTIP; - public static String ACTION_SEARCH_LABEL; public static String ACTION_SEARCH_TOOLTIP; - public static String ACTION_CANCEL_FIND_FILES_LABEL; - public static String ACTION_CANCEL_FIND_FILES_TOOLTIP; - public static String ACTION_CANCEL_SEARCH_LABEL; public static String ACTION_CANCEL_SEARCH_TOOLTIP; @@ -1152,8 +1142,6 @@ public class SystemResources extends NLS public static String ACTION_VIEWFORM_GETLIST_LABEL; public static String ACTION_VIEWFORM_GETLIST_TOOLTIP; - public static String ACTION_COMMANDSVIEW_SAVEASFILTER_LABEL; - public static String ACTION_COMMANDSVIEW_SAVEASFILTER_TOOLTIP; public static String ACTION_EXPAND_SELECTED_LABEL; public static String ACTION_EXPAND_SELECTED_TOOLTIP; @@ -1214,8 +1202,6 @@ public class SystemResources extends NLS public static String RESID_PROPERTIES_PROPERTIES_LABEL; public static String RESID_PROPERTIES_PROPERTIES_TOOLTIP; - - public static String ACTION_COMPILE_NOPROMPT_LABEL; // Services form public static String RESID_SERVICESFORM_CONFIGURATION_TOOLTIP; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResources.properties b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResources.properties index ff65eaff248..01aae035c13 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResources.properties +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResources.properties @@ -14,6 +14,7 @@ # Martin Oberhuber (Wind River) - [185552] Remove remoteSystemsViewPreferencesActions extension point # David McKnight (IBM) - [210229] table refresh needs unique table-specific tooltip-text # Kevin Doyle (IBM) - [212944] New Profile dialog should have title "New Profile" +# David McKnight (IBM) - [216252] [nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible ################################################################################ # NLS_MESSAGEFORMAT_VAR @@ -886,12 +887,6 @@ ACTION_RUN_TOOLTIP=Run this prompt. Same as expanding it ACTION_SIMPLERENAME_LABEL=Rename... ACTION_SIMPLERENAME_TOOLTIP=Rename selected resources -ACTION_IMPORT_TO_PROJECT_LABEL= Import To Project... -ACTION_IMPORT_TO_PROJECT_TOOLTIP= Import contents of selected folder to a project - -ACTION_EXPORT_FROM_PROJECT_LABEL= Export From Project... -ACTION_EXPORT_FROM_PROJECT_TOOLTIP= Export contents of project to the selected folder - ACTION_REFRESH_ALL_LABEL=Refresh All ACTION_REFRESH_ALL_TOOLTIP=Refresh all resource information @@ -1019,15 +1014,9 @@ ACTION_MONITOR_TOOLTIP=Display the contents of this resource in a monitoring tab ACTION_ERROR_LIST_LABEL=Show Subsequent Problems in Error List ACTION_ERROR_LIST_TOOLTIP=Display all errors, warnings and informational messages that appear from here on in this shell in the Remote Error List view. -ACTION_FIND_FILES_LABEL=Find Files... -ACTION_FIND_FILES_TOOLTIP=Search for files under the selected resource - ACTION_SEARCH_LABEL=Search... ACTION_SEARCH_TOOLTIP=Opens a dialog to search for text and files -ACTION_CANCEL_FIND_FILES_LABEL=Cancel Find Files -ACTION_CANCEL_FIND_FILES_TOOLTIP=Terminate find files operation - ACTION_CANCEL_SEARCH_LABEL=Cancel Search ACTION_CANCEL_SEARCH_TOOLTIP=Terminate search operation @@ -1070,11 +1059,6 @@ ACTION_VIEWFORM_REFRESH_TOOLTIP=Refresh all resource information from disk ACTION_VIEWFORM_GETLIST_LABEL=Get List ACTION_VIEWFORM_GETLIST_TOOLTIP=Retrieve list and populate tree view - -ACTION_COMMANDSVIEW_SAVEASFILTER_LABEL=Save as Command Set -ACTION_COMMANDSVIEW_SAVEASFILTER_TOOLTIP=Save the command as a new Command Set - - ACTION_EXPAND_SELECTED_LABEL=Expand ACTION_EXPAND_SELECTED_TOOLTIP=Expand selected elements. '+' @@ -1414,7 +1398,6 @@ RESID_PROPERTIES_FACTORIES_TOOLTIP= RESID_PROPERTIES_PROPERTIES_LABEL=Properties RESID_PROPERTIES_PROPERTIES_TOOLTIP= -ACTION_COMPILE_NOPROMPT_LABEL=Compile RESID_SERVICESFORM_CONFIGURATION_TOOLTIP=Select the configuration you wish to use to enable this subsystem. A configuration comprises a connector service and a subsystem service. RESID_SERVICESFORM_SERVICES_TOOLTIP=Select the elements of your chosen configuration and you can view and edit their properties in the Properties section. diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewResources.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewResources.java index 2c0fa42d0e8..447efdef4c5 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewResources.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewResources.java @@ -13,6 +13,7 @@ * * Contributors: * David McKnight (IBM) - [209593] [api] add support for "file permissions" and "owner" properties for unix files + * David McKnight (IBM) - [216252] [nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible *******************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -127,98 +128,16 @@ public class SystemViewResources extends NLS { public static String RESID_PROPERTY_FILTERS_LABEL; public static String RESID_PROPERTY_FILTERS_DESCRIPTION; - // Property sheet values: Files + + // files - still needed outside of files.ui public static String RESID_PROPERTY_FILE_TYPE_FILE_VALUE; public static String RESID_PROPERTY_FILE_TYPE_FOLDER_VALUE; public static String RESID_PROPERTY_FILE_TYPE_ROOT_VALUE; - - public static String RESID_PROPERTY_ARCHIVE_EXPANDEDSIZE_LABEL; - - public static String RESID_PROPERTY_ARCHIVE_EXPANDEDSIZE_VALUE; - public static String RESID_PROPERTY_ARCHIVE_EXPANDEDSIZE_DESCRIPTION; - - public static String RESID_PROPERTY_ARCHIVE_COMMENT_LABEL; - public static String RESID_PROPERTY_ARCHIVE_COMMENT_DESCRIPTION; - - public static String RESID_PROPERTY_VIRTUALFILE_COMPRESSEDSIZE_LABEL; - public static String RESID_PROPERTY_VIRTUALFILE_COMPRESSEDSIZE_VALUE; - public static String RESID_PROPERTY_VIRTUALFILE_COMPRESSEDSIZE_DESCRIPTION; - - public static String RESID_PROPERTY_VIRTUALFILE_COMMENT_LABEL; - public static String RESID_PROPERTY_VIRTUALFILE_COMMENT_DESCRIPTION; - - public static String RESID_PROPERTY_VIRTUALFILE_COMPRESSIONRATIO_LABEL; - public static String RESID_PROPERTY_VIRTUALFILE_COMPRESSIONRATIO_DESCRIPTION; - - public static String RESID_PROPERTY_VIRTUALFILE_COMPRESSIONMETHOD_LABEL; - public static String RESID_PROPERTY_VIRTUALFILE_COMPRESSIONMETHOD_DESCRIPTION; - - public static String RESID_PROPERTY_FILE_SIZE_VALUE; - public static String RESID_PROPERTY_FILE_PATH_LABEL; public static String RESID_PROPERTY_FILE_PATH_TOOLTIP; - public static String RESID_PROPERTY_FILE_LASTMODIFIED_LABEL; - public static String RESID_PROPERTY_FILE_LASTMODIFIED_TOOLTIP; - public static String RESID_PROPERTY_FILE_SIZE_LABEL; - public static String RESID_PROPERTY_FILE_SIZE_TOOLTIP; - - public static String RESID_PROPERTY_FILE_CANONICAL_PATH_LABEL; - public static String RESID_PROPERTY_FILE_CANONICAL_PATH_TOOLTIP; - - public static String RESID_PROPERTY_FILE_EXTENSION_LABEL; - public static String RESID_PROPERTY_FILE_EXTENSION_TOOLTIP; - - public static String RESID_PROPERTY_FILE_PERMISSIONS_LABEL; - public static String RESID_PROPERTY_FILE_PERMISSIONS_TOOLTIP; - - public static String RESID_PROPERTY_FILE_OWNER_LABEL; - public static String RESID_PROPERTY_FILE_OWNER_TOOLTIP; - - public static String RESID_PROPERTY_FILE_GROUP_LABEL; - public static String RESID_PROPERTY_FILE_GROUP_TOOLTIP; - - public static String RESID_PROPERTY_FILE_CLASSIFICATION_LABEL; - public static String RESID_PROPERTY_FILE_CLASSIFICATION_TOOLTIP; - - public static String RESID_PROPERTY_FILE_READONLY_LABEL; - public static String RESID_PROPERTY_FILE_READONLY_TOOLTIP; - - public static String RESID_PROPERTY_FILE_READABLE_LABEL; - public static String RESID_PROPERTY_FILE_READABLE_TOOLTIP; - - public static String RESID_PROPERTY_FILE_WRITABLE_LABEL; - public static String RESID_PROPERTY_FILE_WRITABLE_TOOLTIP; - - public static String RESID_PROPERTY_FILE_HIDDEN_LABEL; - public static String RESID_PROPERTY_FILE_HIDDEN_TOOLTIP; - - // search result properties - public static String RESID_PROPERTY_SEARCH_LINE_LABEL; - public static String RESID_PROPERTY_SEARCH_LINE_TOOLTIP; - //public static String RESID_PROPERTY_SEARCH_CHAR_END_LABEL; - //public static String RESID_PROPERTY_SEARCH_CHAR_END_TOOLTIP; - - - - // shell status properties - public static String RESID_PROPERTY_SHELL_STATUS_LABEL; - public static String RESID_PROPERTY_SHELL_STATUS_TOOLTIP; - public static String RESID_PROPERTY_SHELL_CONTEXT_LABEL; - public static String RESID_PROPERTY_SHELL_CONTEXT_TOOLTIP; - - public static String RESID_PROPERTY_SHELL_STATUS_ACTIVE_VALUE; - public static String RESID_PROPERTY_SHELL_STATUS_INACTIVE_VALUE; - - // error properties - public static String RESID_PROPERTY_ERROR_FILENAME_LABEL; - public static String RESID_PROPERTY_ERROR_FILENAME_TOOLTIP; - - public static String RESID_PROPERTY_ERROR_LINENO_LABEL; - public static String RESID_PROPERTY_ERROR_LINENO_TOOLTIP; - // Property sheet values: Messages public static String RESID_PROPERTY_MESSAGE_TYPE_VALUE; @@ -227,13 +146,6 @@ public class SystemViewResources extends NLS { public static String RESID_PROPERTY_TEAM_SSFACTORY_TYPE_VALUE; // Miscellaneous / common - public static String RESID_PROPERTY_ORIGIN_LABEL; - public static String RESID_PROPERTY_ORIGIN_TOOLTIP; - public static String RESID_PROPERTY_COMMAND_LABEL; - public static String RESID_PROPERTY_COMMAND_TOOLTIP; - public static String RESID_PROPERTY_COMMENT_LABEL; - public static String RESID_PROPERTY_COMMENT_TOOLTIP; - public static String RESID_PROPERTY_LINKINGACTION_TEXT; public static String RESID_PROPERTY_LINKINGACTION_TOOLTIP; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewResources.properties b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewResources.properties index 7a501cae4b1..266ad91258a 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewResources.properties +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewResources.properties @@ -13,6 +13,7 @@ # # Contributors: # David McKnight (IBM) - [209593] [api] add support for "file permissions" and "owner" properties for unix files +# David McKnight (IBM) - [216252] [nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible ############################################################################### # NLS_MESSAGEFORMAT_VAR @@ -109,95 +110,21 @@ RESID_PROPERTY_FILTERPARENTPOOL_TOOLTIP=Filter pool that directly or indirectly RESID_PROPERTY_FILTERS_LABEL=Filter Strings RESID_PROPERTY_FILTERS_DESCRIPTION=List of file system filters for this named filter - - -#FILE PROPERTIES +# generic files - needed outside of files.ui RESID_PROPERTY_FILE_TYPE_FILE_VALUE=File RESID_PROPERTY_FILE_TYPE_FOLDER_VALUE=Folder RESID_PROPERTY_FILE_TYPE_ROOT_VALUE=Root -RESID_PROPERTY_FILE_LASTMODIFIED_LABEL=Last modified -RESID_PROPERTY_FILE_LASTMODIFIED_TOOLTIP=When last changed -RESID_PROPERTY_FILE_SIZE_LABEL=Size -RESID_PROPERTY_FILE_SIZE_VALUE=&1 bytes -RESID_PROPERTY_FILE_SIZE_TOOLTIP=Number of bytes in this file RESID_PROPERTY_FILE_PATH_LABEL=Location RESID_PROPERTY_FILE_PATH_TOOLTIP=Path containing this file or folder -RESID_PROPERTY_FILE_READABLE_LABEL=Readable -RESID_PROPERTY_FILE_READABLE_TOOLTIP=Is this file readable -RESID_PROPERTY_FILE_WRITABLE_LABEL=Writable -RESID_PROPERTY_FILE_WRITABLE_TOOLTIP=Is this file writable -RESID_PROPERTY_FILE_READONLY_LABEL=Read-only -RESID_PROPERTY_FILE_READONLY_TOOLTIP=Is this file read-only -RESID_PROPERTY_FILE_HIDDEN_LABEL=Hidden -RESID_PROPERTY_FILE_HIDDEN_TOOLTIP=Is this file hidden -RESID_PROPERTY_FILE_CANONICAL_PATH_LABEL=Canonical Path -RESID_PROPERTY_FILE_CANONICAL_PATH_TOOLTIP=Canonical path of this file or folder -RESID_PROPERTY_FILE_CLASSIFICATION_LABEL=Classification -RESID_PROPERTY_FILE_CLASSIFICATION_TOOLTIP=Classification path of this file -RESID_PROPERTY_FILE_EXTENSION_LABEL=Extension -RESID_PROPERTY_FILE_EXTENSION_TOOLTIP=Extension of this file - -RESID_PROPERTY_FILE_PERMISSIONS_LABEL=Permissions -RESID_PROPERTY_FILE_PERMISSIONS_TOOLTIP=The user, group and other permissions of this file -RESID_PROPERTY_FILE_OWNER_LABEL=Owner -RESID_PROPERTY_FILE_OWNER_TOOLTIP=The owner of this file -RESID_PROPERTY_FILE_GROUP_LABEL=Group -RESID_PROPERTY_FILE_GROUP_TOOLTIP=The group of this file - - -#SEARCH RESULT PROPERTIES -RESID_PROPERTY_SEARCH_LINE_LABEL=Line -RESID_PROPERTY_SEARCH_LINE_TOOLTIP=Line in file of match - -#ARCHIVE PROPERTIES -RESID_PROPERTY_ARCHIVE_EXPANDEDSIZE_LABEL=Expanded Size -RESID_PROPERTY_ARCHIVE_EXPANDEDSIZE_VALUE=&1 bytes -RESID_PROPERTY_ARCHIVE_EXPANDEDSIZE_DESCRIPTION=Number of bytes in this archive when it is decompressed/expanded -RESID_PROPERTY_ARCHIVE_COMMENT_LABEL=Comment -RESID_PROPERTY_ARCHIVE_COMMENT_DESCRIPTION=The user-defined comment for this archive - - - -#VIRTUAL FILE PROPERTIES -RESID_PROPERTY_VIRTUALFILE_COMPRESSEDSIZE_LABEL=Compressed Size -RESID_PROPERTY_VIRTUALFILE_COMPRESSEDSIZE_VALUE=&1 bytes -RESID_PROPERTY_VIRTUALFILE_COMPRESSEDSIZE_DESCRIPTION=Number of bytes in the file after compression -RESID_PROPERTY_VIRTUALFILE_COMPRESSIONRATIO_LABEL=Compression ratio -RESID_PROPERTY_VIRTUALFILE_COMPRESSIONRATIO_DESCRIPTION=Compressed size divided by expanded size expressed as a percentage -RESID_PROPERTY_VIRTUALFILE_COMPRESSIONMETHOD_LABEL=Compression method -RESID_PROPERTY_VIRTUALFILE_COMPRESSIONMETHOD_DESCRIPTION=The algorithm used to compress the file -RESID_PROPERTY_VIRTUALFILE_COMMENT_LABEL=Comment -RESID_PROPERTY_VIRTUALFILE_COMMENT_DESCRIPTION=The user-defined comment for this virtual file - -#SHELL PROPERTIES -RESID_PROPERTY_SHELL_STATUS_LABEL=Status -RESID_PROPERTY_SHELL_STATUS_TOOLTIP=Status of the shell -RESID_PROPERTY_SHELL_CONTEXT_LABEL=Context -RESID_PROPERTY_SHELL_CONTEXT_TOOLTIP=Current context within the shell -RESID_PROPERTY_SHELL_STATUS_ACTIVE_VALUE=Running -RESID_PROPERTY_SHELL_STATUS_INACTIVE_VALUE=Finished #MESSAGE PROPERTIES RESID_PROPERTY_MESSAGE_TYPE_VALUE=Message -#ERROR PROPERTIES -RESID_PROPERTY_ERROR_FILENAME_LABEL=File -RESID_PROPERTY_ERROR_FILENAME_TOOLTIP=File Containing Error -RESID_PROPERTY_ERROR_LINENO_LABEL=Line -RESID_PROPERTY_ERROR_LINENO_TOOLTIP=Line number - #TEAM VIEW PROPERTIES RESID_PROPERTY_TEAM_CATEGORY_TYPE_VALUE=Category RESID_PROPERTY_TEAM_SSFACTORY_TYPE_VALUE=SubSystem factory #MISCELLANEOUS PROPERTIES -RESID_PROPERTY_ORIGIN_LABEL=Origin -RESID_PROPERTY_ORIGIN_TOOLTIP=Where this originated from -RESID_PROPERTY_COMMAND_LABEL=Command -RESID_PROPERTY_COMMAND_TOOLTIP=The command that will be executed -RESID_PROPERTY_COMMENT_LABEL=Comment -RESID_PROPERTY_COMMENT_TOOLTIP=A description - RESID_PROPERTY_LINKINGACTION_TEXT = &Link with Editor RESID_PROPERTY_LINKINGACTION_TOOLTIP = Link with Editor diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewRootInputAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewRootInputAdapter.java index 31fec01214b..f41b5c6631f 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewRootInputAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewRootInputAdapter.java @@ -17,6 +17,7 @@ * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API * Martin Oberhuber (Wind River) - [190195] Cannot enable new connection prompt in system view * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core + * David McKnight (IBM) - [216252] [nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible ********************************************************************************/ package org.eclipse.rse.internal.ui.view; diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionsResources.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionsResources.java index d9c9f4a699b..ee59f698534 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionsResources.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionsResources.java @@ -7,6 +7,7 @@ * * Contributors: * IBM Corporation - initial API and implementation + * David McKnight (IBM) - [216252] [nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible *******************************************************************************/ package org.eclipse.rse.internal.useractions; @@ -63,6 +64,16 @@ public class UserActionsResources extends NLS { public static String RESID_PROPERTY_COMPILETYPE_TYPES_DESCRIPTION; // TEAM VIEW public static String RESID_TEAMVIEW_USERACTION_VALUE; + + + public static String RESID_PROPERTY_ORIGIN_LABEL; + public static String RESID_PROPERTY_ORIGIN_TOOLTIP; + public static String RESID_PROPERTY_COMMAND_LABEL; + public static String RESID_PROPERTY_COMMAND_TOOLTIP; + public static String RESID_PROPERTY_COMMENT_LABEL; + public static String RESID_PROPERTY_COMMENT_TOOLTIP; + + static { // load message values from bundle file NLS.initializeMessages(BUNDLE_NAME, UserActionsResources.class); diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionsResources.properties b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionsResources.properties index 3648682e42f..ff2a228aa6c 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionsResources.properties +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionsResources.properties @@ -7,6 +7,7 @@ # # Contributors: # IBM Corporation - initial API and implementation +# David McKnight (IBM) - [216252] [nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible ############################################################################### # NLS_MESSAGEFORMAT_NONE @@ -83,3 +84,10 @@ RESID_PROPERTY_COMPILETYPE_TYPES_DESCRIPTION=File type this refers to #============================================================= RESID_TEAMVIEW_USERACTION_VALUE=User action +RESID_PROPERTY_ORIGIN_LABEL=Origin +RESID_PROPERTY_ORIGIN_TOOLTIP=Where this originated from +RESID_PROPERTY_COMMAND_LABEL=Command +RESID_PROPERTY_COMMAND_TOOLTIP=The command that will be executed +RESID_PROPERTY_COMMENT_LABEL=Comment +RESID_PROPERTY_COMMENT_TOOLTIP=A description + diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/teamview/SystemTeamViewCompileCommandAdapter.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/teamview/SystemTeamViewCompileCommandAdapter.java index ede668aeac2..8cec5271211 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/teamview/SystemTeamViewCompileCommandAdapter.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/teamview/SystemTeamViewCompileCommandAdapter.java @@ -9,6 +9,7 @@ * IBM Corporation - initial API and implementation * Martin Oberhuber (Wind River) - [182454] improve getAbsoluteName() documentation * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API + * David McKnight (IBM) - [216252] [nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible *******************************************************************************/ package org.eclipse.rse.internal.useractions.ui.compile.teamview; @@ -17,7 +18,6 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.rse.internal.ui.view.SystemViewResources; import org.eclipse.rse.internal.useractions.UserActionsResources; import org.eclipse.rse.internal.useractions.ui.compile.SystemCompileCommand; import org.eclipse.rse.ui.SystemMenuManager; @@ -139,11 +139,11 @@ public class SystemTeamViewCompileCommandAdapter extends AbstractSystemViewAdapt propertyDescriptorArray = new PropertyDescriptor[2]; int idx = 0; // origin - propertyDescriptorArray[idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_ORIGIN, SystemViewResources.RESID_PROPERTY_ORIGIN_LABEL, - SystemViewResources.RESID_PROPERTY_ORIGIN_TOOLTIP); + propertyDescriptorArray[idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_ORIGIN,UserActionsResources.RESID_PROPERTY_ORIGIN_LABEL, + UserActionsResources.RESID_PROPERTY_ORIGIN_TOOLTIP); // command - propertyDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_COMMAND, SystemViewResources.RESID_PROPERTY_COMMAND_LABEL, - SystemViewResources.RESID_PROPERTY_COMMAND_TOOLTIP); + propertyDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_COMMAND, UserActionsResources.RESID_PROPERTY_COMMAND_LABEL, + UserActionsResources.RESID_PROPERTY_COMMAND_TOOLTIP); } return propertyDescriptorArray; } diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/teamview/SystemTeamViewUserActionAdapter.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/teamview/SystemTeamViewUserActionAdapter.java index 1a0fbc7791e..43fa8a2b156 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/teamview/SystemTeamViewUserActionAdapter.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/teamview/SystemTeamViewUserActionAdapter.java @@ -9,6 +9,7 @@ * IBM Corporation - initial API and implementation * Martin Oberhuber (Wind River) - [182454] improve getAbsoluteName() documentation * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API + * David McKnight (IBM) - [216252] [nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible *******************************************************************************/ package org.eclipse.rse.internal.useractions.ui.compile.teamview; @@ -17,7 +18,6 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.rse.internal.ui.view.SystemViewResources; import org.eclipse.rse.internal.useractions.UserActionsIcon; import org.eclipse.rse.internal.useractions.UserActionsResources; import org.eclipse.rse.internal.useractions.ui.uda.SystemUDActionElement; @@ -147,14 +147,14 @@ public class SystemTeamViewUserActionAdapter extends AbstractSystemViewAdapter i propertyDescriptorArray = new PropertyDescriptor[4]; int idx = 0; // origin - propertyDescriptorArray[idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_ORIGIN, SystemViewResources.RESID_PROPERTY_ORIGIN_LABEL, - SystemViewResources.RESID_PROPERTY_ORIGIN_TOOLTIP); + propertyDescriptorArray[idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_ORIGIN, UserActionsResources.RESID_PROPERTY_ORIGIN_LABEL, + UserActionsResources.RESID_PROPERTY_ORIGIN_TOOLTIP); // command - propertyDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_COMMAND, SystemViewResources.RESID_PROPERTY_COMMAND_LABEL, - SystemViewResources.RESID_PROPERTY_COMMAND_TOOLTIP); + propertyDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_COMMAND, UserActionsResources.RESID_PROPERTY_COMMAND_LABEL, + UserActionsResources.RESID_PROPERTY_COMMAND_TOOLTIP); // comment - propertyDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_COMMENT, SystemViewResources.RESID_PROPERTY_COMMENT_LABEL, - SystemViewResources.RESID_PROPERTY_COMMENT_TOOLTIP); + propertyDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_COMMENT, UserActionsResources.RESID_PROPERTY_COMMENT_LABEL, + UserActionsResources.RESID_PROPERTY_COMMENT_TOOLTIP); // domain propertyDescriptorArray[++idx] = createSimplePropertyDescriptor(ISystemPropertyConstants.P_USERACTION_DOMAIN, UserActionsResources.RESID_PROPERTY_USERACTION_DOMAIN_LABEL, UserActionsResources.RESID_PROPERTY_USERACTION_DOMAIN_TOOLTIP);