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 c7032821b1d..6a2eb3ad854 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 @@ -54,33 +54,7 @@ public class FileResources extends NLS public static String DefaultEditorDescription_name; - // EXTRACT ARCHIVE TO DIALOG... - public static String RESID_EXTRACTTO_TITLE; - public static String RESID_EXTRACTTO_PROMPT; - - // COMBINE ARCHIVES DIALOG... - public static String RESID_COMBINE_TITLE; - public static String RESID_COMBINE_PROMPT; - public static String RESID_COMBINE_NAME_LABEL; - public static String RESID_COMBINE_NAME_TOOLTIP; - public static String RESID_COMBINE_TYPE_LABEL; - public static String RESID_COMBINE_TYPE_TOOLTIP; - // CONVERT ARCHIVE DIALOG... - public static String RESID_CONVERT_TITLE; - public static String RESID_CONVERT_PROMPT; - public static String RESID_CONVERT_LOCATION; - public static String RESID_CONVERT_NAMEANDTYPE; - - // ADD TO ARCHIVE DIALOG... - public static String RESID_ADDTOARCHIVE_TITLE; - public static String RESID_ADDTOARCHIVE_PROMPT; - public static String RESID_ADDTOARCHIVE_LOCATION; - public static String RESID_ADDTOARCHIVE_NAMEANDTYPE; - public static String RESID_ADDTOARCHIVE_SAVEPATH_LABEL; - public static String RESID_ADDTOARCHIVE_SAVEPATH_TOOLTIP; - public static String RESID_ADDTOARCHIVE_RELATIVETO_LABEL; - public static String RESID_ADDTOARCHIVE_RELATIVETO_TOOLTIP; // NEW FILE WIZARD... public static String RESID_NEWFILE_TITLE; @@ -260,21 +234,6 @@ public class FileResources extends NLS public static String ACTION_REPLACEWITH_HISTORY_LABEL; public static String ACTION_REPLACEWITH_HISTORY_TOOLTIP; - // Archive Menu Items - public static String ACTION_EXTRACT_LABEL; - public static String ACTION_EXTRACT_SUB_LABEL; - public static String ACTION_EXTRACT_TOOLTIP; - public static String ACTION_EXTRACT_TO_LABEL; - public static String ACTION_EXTRACT_TO_TOOLTIP; - - public static String ACTION_COMBINE_LABEL; - public static String ACTION_COMBINE_TOOLTIP; - - public static String ACTION_CONVERT_LABEL; - public static String ACTION_CONVERT_TOOLTIP; - - public static String ACTION_ADDTOARCHIVE_LABEL; - public static String ACTION_ADDTOARCHIVE_TOOLTIP; // Project menu item public static String RESID_OPEN_FROM_ASSOCIATED_PROJECT; 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 5d8266c4d9f..e4044226208 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 @@ -220,64 +220,14 @@ ACTION_COMPAREWITH_HISTORY_TOOLTIP= Compare the local edition history of this re ACTION_REPLACEWITH_HISTORY_LABEL= Local History... ACTION_REPLACEWITH_HISTORY_TOOLTIP= Replace the remote file with a previous edition from it's local history -################################################################################## -############################ Archive menu items ############################# -################################################################################## -ACTION_EXTRACT_LABEL=Extract -ACTION_EXTRACT_SUB_LABEL=Extract to %1 -ACTION_EXTRACT_TOOLTIP=Extract archive to current directory -ACTION_EXTRACT_TO_LABEL=Extract to... -ACTION_EXTRACT_TO_TOOLTIP=Extract archive to a specified directory -ACTION_COMBINE_LABEL=Combine... -ACTION_COMBINE_TOOLTIP=Combine archives into a single archive - -ACTION_CONVERT_LABEL=Convert... -ACTION_CONVERT_TOOLTIP=Convert archives into another archive type - -ACTION_ADDTOARCHIVE_LABEL=Add To Archive... -ACTION_ADDTOARCHIVE_TOOLTIP=Add files to a new or existing archive ################################################################################## ############################ Project menu item ############################# ################################################################################## RESID_OPEN_FROM_ASSOCIATED_PROJECT=Open from Associated Project (&1) -#============================================================= -# EXTRACT ARCHIVE TO DIALOG... -#============================================================= -RESID_EXTRACTTO_TITLE=Extract To -RESID_EXTRACTTO_PROMPT=Choose the destination for the contents of archive &1 -#============================================================= -# COMBINE ARCHIVES DIALOG... -#============================================================= -RESID_COMBINE_TITLE=Combine Archives -RESID_COMBINE_PROMPT=Choose the destination for the combined archives -RESID_COMBINE_NAME_LABEL=Archive name -RESID_COMBINE_NAME_TOOLTIP=Enter a file name for the combined/converted archive -RESID_COMBINE_TYPE_LABEL=Archive type -RESID_COMBINE_TYPE_TOOLTIP=Select an archive type for the combined/converted archive - -#============================================================= -# CONVERT ARCHIVE DIALOG... -#============================================================= -RESID_CONVERT_TITLE=Convert Archive -RESID_CONVERT_PROMPT=Source archive: &1 -RESID_CONVERT_LOCATION=Select a destination folder for the converted copy of the archive: -RESID_CONVERT_NAMEANDTYPE=Select a new name and type for the converted copy of the archive: - -#============================================================= -# ADD TO ARCHIVE DIALOG... -#============================================================= -RESID_ADDTOARCHIVE_TITLE=Add to Archive -RESID_ADDTOARCHIVE_PROMPT=Choose a destination archive for the selected files, or create a new archive -RESID_ADDTOARCHIVE_LOCATION=Select a destination folder for the new archive, or the location of an existing archive: -RESID_ADDTOARCHIVE_NAMEANDTYPE=Select a name and type for the new archive, or enter an existing archive's name and type: -RESID_ADDTOARCHIVE_SAVEPATH_LABEL=Save full path info -RESID_ADDTOARCHIVE_SAVEPATH_TOOLTIP=Choose whether or not to preserve the full path of the selected files relative to each other when they are added to the archive. -RESID_ADDTOARCHIVE_RELATIVETO_LABEL=Save full path info relative to: -RESID_ADDTOARCHIVE_RELATIVETO_TOOLTIP=Choose the common directory from which relative paths will be determined. #============================================================= # ACTIONS... diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.java index c0c8b5cc0fc..392700eb933 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.java @@ -169,16 +169,8 @@ public class SystemFileResources extends NLS public static String RESID_PP_FILE_ENCODING_OTHER_TOOLTIP; public static String RESID_PP_FILE_ENCODING_ENTER_TOOLTIP; - // ------------------------------- - // Enter or select file form - // ------------------------------- + public static String RESID_ENTER_OR_SELECT_FILE_TITLE; - public static String RESID_ENTER_OR_SELECT_FILE_VERBIAGE_LABEL; - public static String RESID_ENTER_OR_SELECT_FILE_ENTER_LABEL; - public static String RESID_ENTER_OR_SELECT_FILE_ENTER_TOOLTIP; - public static String RESID_ENTER_OR_SELECT_FILE_SELECT_TOOLTIP; - public static String RESID_ENTER_OR_SELECT_FILE_FILE_LABEL; - public static String RESID_ENTER_OR_SELECT_FILE_FILE_TOOLTIP; public static String RESID_JOB_SEARCH_NAME; public static String RESID_JOB_DECORATEFILES_NAME; diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.properties b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.properties index 48b38b5a1f5..c6489e04f17 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.properties +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.properties @@ -125,16 +125,7 @@ RESID_PP_FILE_TYPE_FILE_VALUE=File RESID_PP_FILE_SIZE_VALUE=&1 bytes -#============================================================= -# ENTER OR SELECT FILE DIALOG... -#============================================================= -RESID_ENTER_OR_SELECT_FILE_TITLE= Specify File -RESID_ENTER_OR_SELECT_FILE_VERBIAGE_LABEL= Enter or select a file -RESID_ENTER_OR_SELECT_FILE_ENTER_LABEL= Enter parent folder: -RESID_ENTER_OR_SELECT_FILE_ENTER_TOOLTIP= Enter the path of the parent folder -RESID_ENTER_OR_SELECT_FILE_SELECT_TOOLTIP= Expand tree and select file or parent folder -RESID_ENTER_OR_SELECT_FILE_FILE_LABEL= File name: -RESID_ENTER_OR_SELECT_FILE_FILE_TOOLTIP= Enter the name of the file + #============================================================= @@ -209,6 +200,9 @@ RESID_PP_FILE_ENCODING_OTHER_LABEL=Other: RESID_PP_FILE_ENCODING_OTHER_TOOLTIP=Specify a different encoding RESID_PP_FILE_ENCODING_ENTER_TOOLTIP=Select or enter an encoding + +RESID_ENTER_OR_SELECT_FILE_TITLE= Specify File + #============================================================= # RE-USABLE COMPOSITE FILE SYSTEM WIDGETS #============================================================= diff --git a/rse/plugins/org.eclipse.rse.ui/HelpContexts.xml b/rse/plugins/org.eclipse.rse.ui/HelpContexts.xml index 06b74fd70f0..0537eda7c4c 100644 --- a/rse/plugins/org.eclipse.rse.ui/HelpContexts.xml +++ b/rse/plugins/org.eclipse.rse.ui/HelpContexts.xml @@ -318,26 +318,6 @@ Martin Oberhuber (Wind River) - [174945] split importexport icons from rse.ui Paste the contents of the system clipboard into the selected resource. - -Extract the selected archive's contents to the same folder in which the archive is located. A new folder will be created with the same name as the archive for the archive's contents. - - - -Extract the selected archive's contents to another folder. You will be prompted to select the destination folder. - - - -Combine the selected archives into a single archive. You will be prompted to create the destination archive. - - - -Convert the selected archives into another type of archive. You will be prompted to create the destination archive. - - - -Add the selected files to a new or existing archive. You will be prompted to select or create the destination archive. - - Select a command to compile this resource with. The command will first be prompted, then run. diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemIconConstants.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemIconConstants.java index 0211aa26c78..8aea4922fea 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemIconConstants.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemIconConstants.java @@ -236,22 +236,6 @@ public interface ISystemIconConstants public static final String ICON_SYSTEM_WORKWITHCOMPILECMDS_ROOT = "workwithcompilecmds"; //$NON-NLS-1$ public static final String ICON_SYSTEM_WORKWITHCOMPILECMDS = ICON_ACTIONS_DIR + ICON_SYSTEM_WORKWITHCOMPILECMDS_ROOT+ICON_EXT; public static final String ICON_SYSTEM_WORKWITHCOMPILECMDS_ID = PREFIX+ICON_SYSTEM_WORKWITHCOMPILECMDS_ROOT+ICON_SUFFIX; - - public static final String ICON_SYSTEM_EXTRACT_ROOT = "xtrctarchv_tsk"; //$NON-NLS-1$ - public static final String ICON_SYSTEM_EXTRACT = ICON_ACTIONS_DIR + ICON_SYSTEM_EXTRACT_ROOT+ICON_EXT; - public static final String ICON_SYSTEM_EXTRACT_ID = PREFIX+ICON_SYSTEM_EXTRACT_ROOT+ICON_SUFFIX; - - public static final String ICON_SYSTEM_EXTRACTTO_ROOT = "xtrctarchvto_tsk"; //$NON-NLS-1$ - public static final String ICON_SYSTEM_EXTRACTTO = ICON_ACTIONS_DIR + ICON_SYSTEM_EXTRACTTO_ROOT+ICON_EXT; - public static final String ICON_SYSTEM_EXTRACTTO_ID = PREFIX+ICON_SYSTEM_EXTRACTTO_ROOT+ICON_SUFFIX; - - public static final String ICON_SYSTEM_CONVERT_ROOT = "convertarchive_tsk"; //$NON-NLS-1$ - public static final String ICON_SYSTEM_CONVERT = ICON_ACTIONS_DIR + ICON_SYSTEM_CONVERT_ROOT+ICON_EXT; - public static final String ICON_SYSTEM_CONVERT_ID = PREFIX+ICON_SYSTEM_CONVERT_ROOT+ICON_SUFFIX; - - public static final String ICON_SYSTEM_COMBINE_ROOT = "combine_tsk"; //$NON-NLS-1$ - public static final String ICON_SYSTEM_COMBINE = ICON_ACTIONS_DIR + ICON_SYSTEM_COMBINE_ROOT+ICON_EXT; - public static final String ICON_SYSTEM_COMBINE_ID = PREFIX+ICON_SYSTEM_COMBINE_ROOT+ICON_SUFFIX; public static final String ICON_SYSTEM_SHOW_TABLE_ROOT = "systemshowintable"; //$NON-NLS-1$ public static final String ICON_SYSTEM_SHOW_TABLE = ICON_ACTIONS_DIR + ICON_SYSTEM_SHOW_TABLE_ROOT + ICON_EXT; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemMessages.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemMessages.java index d64c892f1d6..b60ecc1c3c7 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemMessages.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemMessages.java @@ -223,11 +223,7 @@ public interface ISystemMessages public static final String MSG_VALIDATE_COMPILESTRING_NOTVALID = "RSEG1199"; //$NON-NLS-1$ public static final String MSG_VALIDATE_ARCHIVE_NAME = "RSEG1120"; //$NON-NLS-1$ - public static final String MSG_COMBINETO_VIRTUAL_DEST = "RSEG1121"; //$NON-NLS-1$ - public static final String MSG_CONVERTTO_VIRTUAL_DEST = "RSEG1127"; //$NON-NLS-1$ - public static final String MSG_ADDTO_VIRTUAL_DEST = "RSEG1128"; //$NON-NLS-1$ - public static final String MSG_DEST_NOT_IN_SOURCE = "RSEG1129"; //$NON-NLS-1$ - public static final String MSG_DEST_TARGET_READONLY = "RSEF1313"; //$NON-NLS-1$ + public static final String FILEMSG_ARCHIVE_CORRUPTED = "RSEG1122"; //$NON-NLS-1$ public static final String MSG_FOLDER_INUSE = "RSEG1150"; // defect 42138 //$NON-NLS-1$ diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java index 031486fa4a2..7abacef5e4e 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java @@ -344,15 +344,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi path+ISystemIconConstants.ICON_SYSTEM_NEWFOLDER); //putImageInRegistry(ISystemConstants.ICON_SYSTEM_COLLAPSEALL_ID, // path+ISystemConstants.ICON_SYSTEM_COLLAPSEALL); // defect 41203 D54577 - - putImageInRegistry(ISystemIconConstants.ICON_SYSTEM_EXTRACT_ID, - path+ISystemIconConstants.ICON_SYSTEM_EXTRACT); - putImageInRegistry(ISystemIconConstants.ICON_SYSTEM_EXTRACTTO_ID, - path+ISystemIconConstants.ICON_SYSTEM_EXTRACTTO); - putImageInRegistry(ISystemIconConstants.ICON_SYSTEM_COMBINE_ID, - path+ISystemIconConstants.ICON_SYSTEM_COMBINE); - putImageInRegistry(ISystemIconConstants.ICON_SYSTEM_CONVERT_ID, - path+ISystemIconConstants.ICON_SYSTEM_CONVERT); +