diff --git a/rse/plugins/org.eclipse.rse.files.ui/plugin.xml b/rse/plugins/org.eclipse.rse.files.ui/plugin.xml index 072f52dfcea..96388dc2ed1 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/plugin.xml +++ b/rse/plugins/org.eclipse.rse.files.ui/plugin.xml @@ -349,6 +349,6 @@ Contributors: - + \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/Activator.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/Activator.java index 12276f014ba..d775be9de79 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/Activator.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/Activator.java @@ -35,7 +35,8 @@ import org.osgi.framework.BundleContext; /** * The main plugin class to be used in the desktop. */ -public class Activator extends AbstractUIPlugin { +public class Activator extends AbstractUIPlugin +{ //The shared instance. private static Activator plugin; @@ -149,4 +150,5 @@ public class Activator extends AbstractUIPlugin { { return svsraf; } + } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/FileResources.properties b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/FileResources.properties deleted file mode 100644 index 194cbc962ad..00000000000 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/FileResources.properties +++ /dev/null @@ -1,288 +0,0 @@ -################################################################################ -# Copyright (c) 2006 IBM Corporation. All rights reserved. -# This program and the accompanying materials are made available under the terms -# of the Eclipse Public License v1.0 which accompanies this distribution, and is -# available at http://www.eclipse.org/legal/epl-v10.html -# -# Initial Contributors: -# The following IBM employees contributed to the Remote System Explorer -# component that contains this file: David McKnight, Kushal Munir, -# Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, -# Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. -# -# Contributors: -# {Name} (company) - description of contribution. -################################################################################ - -# NLS_MESSAGEFORMAT_VAR -# NLS_ENCODING=UTF-8 - -RESID_FILES_DOWNLOAD=Download - -RESID_FILES_PREFERENCES_BUFFER=File Transfer Buffer Size -RESID_FILES_PREFERENCES_DOWNLOAD_BUFFER_SIZE_LABEL=Download (KB) -RESID_FILES_PREFERENCES_UPLOAD_BUFFER_SIZE_LABEL=Upload (KB) -RESID_FILES_PREFERENCES_DOWNLOAD_BUFFER_SIZE_TOOLTIP=Maximum size of buffer to use while sending files from the host to the client -RESID_FILES_PREFERENCES_UPLOAD_BUFFER_SIZE_TOOLTIP=Maximum size of the buffer to use while sending files from the client to the host - -ResourceNavigator_openWith = Open Wit&h -RSEOperation_message = Remote System Explorer Operation - -# --- File Editors --- -FileEditorPreference_fileTypes = File &types: -FileEditorPreference_add = &Add... -FileEditorPreference_remove = &Remove -FileEditorPreference_associatedEditors = Associated &editors: -FileEditorPreference_addEditor = A&dd... -FileEditorPreference_removeEditor = Re&move -FileEditorPreference_default = De&fault -FileEditorPreference_existsTitle = File Type Exists -FileEditorPreference_existsMessage = An entry already exists for that file type -FileEditorPreference_defaultLabel = (default) -FileEditorPreference_contentTypesRelatedLink = See ''{0}'' for content-type based file associations. -FileEditorPreference_isLocked = {0} (locked by ''{1}'' content type) - -FileExtension_fileTypeMessage = Enter file type to add: (*.doc or report.doc for example) -FileExtension_fileTypeLabel = File &type: -FileExtension_shellTitle = New File Type -FileExtension_dialogTitle = Define a New File Type - -DefaultEditorDescription_name = &Default Editor - -#============================================================= -# NEW FILE WIZARD... -#============================================================= -RESID_NEWFILE_TITLE=New File -RESID_NEWFILE_PAGE1_TITLE=Remote File -RESID_NEWFILE_PAGE1_DESCRIPTION=Create a New File -RESID_NEWFILE_FOLDER_LABEL=Folder name -RESID_NEWFILE_FOLDER_TIP=Folder in which the new file will be created -RESID_NEWFILE_CONNECTIONNAME_LABEL=Connection name -RESID_NEWFILE_CONNECTIONNAME_TIP=Connection name where the new file will be created -RESID_NEWFILE_NAME_LABEL=File name -RESID_NEWFILE_NAME_TOOLTIP=Enter a file name for the new file - -#============================================================= -# NEW FOLDER WIZARD... -#============================================================= -RESID_NEWFOLDER_TITLE=New Folder -RESID_NEWFOLDER_PAGE1_TITLE=Remote Folder -RESID_NEWFOLDER_PAGE1_DESCRIPTION=Create a New Folder -RESID_NEWFOLDER_CONNECTIONNAME_LABEL=Connection name -RESID_NEWFOLDER_CONNECTIONNAME_TIP=Connection name where the new folder will be created -RESID_NEWFOLDER_NAME_LABEL=Folder name -RESID_NEWFOLDER_NAME_TOOLTIP=Enter a folder name for the new folder -RESID_NEWFOLDER_FOLDER_LABEL=Folder name -RESID_NEWFOLDER_FOLDER_TIP=Folder in which the new folder will be created - -############################################################## -# Preference pages for universal file system -############################################################## -RESID_PREF_UNIVERSAL_FILES_TITLE=File System Preferences -RESID_PREF_UNIVERSAL_SHOWHIDDEN_LABEL=Show hidden files - -RESID_PREF_UNIVERSAL_PRESERVE_TIMESTAMPS_LABEL=Copy timestamps during file transfer -RESID_PREF_UNIVERSAL_PRESERVE_TIMESTAMPS_TOOLTIP=When files are transferred copy the source timestamps to the destination files - -RESID_PREF_UNIVERSAL_FILES_FILETYPES_TYPE_LABEL=File types: -RESID_PREF_UNIVERSAL_FILES_FILETYPES_TYPE_TOOLTIP=List of file types - -RESID_PREF_UNIVERSAL_FILES_FILETYPES_TABLECOL_LABEL=Type -RESID_PREF_UNIVERSAL_FILES_FILETYPES_TABLECOL_TOOLTIP=Type - -RESID_PREF_UNIVERSAL_FILES_FILETYPES_ADDBUTTON_LABEL=Add... -RESID_PREF_UNIVERSAL_FILES_FILETYPES_ADDBUTTON_TOOLTIP=Add a file type - -RESID_PREF_UNIVERSAL_FILES_FILETYPES_REMOVEBUTTON_LABEL=Remove -RESID_PREF_UNIVERSAL_FILES_FILETYPES_REMOVEBUTTON_TOOLTIP=Remove selected file type - -RESID_PREF_UNIVERSAL_FILES_FILETYPES_MODE_LABEL=File Transfer Mode -RESID_PREF_UNIVERSAL_FILES_FILETYPES_MODE_TOOLTIP=Mode of file transfer for selected file type - -RESID_PREF_UNIVERSAL_FILES_FILETYPES_MODE_BINARY_LABEL=Binary -RESID_PREF_UNIVERSAL_FILES_FILETYPES_MODE_BINARY_TOOLTIP=Transfer as binary file - -RESID_PREF_UNIVERSAL_FILES_FILETYPES_MODE_TEXT_LABEL=Text -RESID_PREF_UNIVERSAL_FILES_FILETYPES_MODE_TEXT_TOOLTIP=Transfer as text file - -RESID_PREF_UNIVERSAL_FILES_FILETYPES_DEFAULT_MODE_LABEL=Default File Transfer Mode -RESID_PREF_UNIVERSAL_FILES_FILETYPES_DEFAULT_MODE_TOOLTIP=Default mode of file transfer for unspecified file types - -################################################################################### -############################ Remote Search ############################## -################################################################################### -RESID_SEARCH_STRING_LABEL_LABEL= Search string (leave empty for file search): -RESID_SEARCH_STRING_LABEL_TOOLTIP= String to be searched -RESID_SEARCH_STRING_COMBO_TOOLTIP= Enter or select search string -RESID_SEARCH_CASE_BUTTON_LABEL= Case sensitive -RESID_SEARCH_CASE_BUTTON_TOOLTIP= Specify whether case should be considered during search -RESID_SEARCH_STRING_HINT_LABEL= (* = any string, ? = any character, \\ = escape for literals: * ? \\) -RESID_SEARCH_STRING_HINT_TOOLTIP= Special characters allowed in search string -RESID_SEARCH_STRING_REGEX_LABEL= Regular expression -RESID_SEARCH_STRING_REGEX_TOOLTIP= Specify whether search string is a regular expression -RESID_SEARCH_FILENAME_LABEL_LABEL= File name patterns: -RESID_SEARCH_FILENAME_LABEL_TOOLTIP= File name patterns -RESID_SEARCH_FILENAME_COMBO_TOOLTIP= Enter or select file name patterns -RESID_SEARCH_FILENAME_BROWSE_LABEL= Browse... -RESID_SEARCH_FILENAME_BROWSE_TOOLTIP= Opens a dialog to select or enter file types -RESID_SEARCH_FILENAME_HINT_LABEL= Patterns are separated by comma (* = any string, ? = any character) -RESID_SEARCH_FILENAME_HINT_TOOLTIP= Special characters allowed in file name patterns -RESID_SEARCH_FILENAME_REGEX_LABEL= Regular expression -RESID_SEARCH_FILENAME_REGEX_TOOLTIP= Specify whether file name pattern is a regular expression -RESID_SEARCH_FOLDERNAME_LABEL_LABEL= Folder: -RESID_SEARCH_FOLDERNAME_LABEL_TOOLTIP= Folder path -RESID_SEARCH_FOLDERNAME_COMBO_TOOLTIP= Identifies the folder in which to search. It is fully qualified including the connection name, as in connection:/path/folder -RESID_SEARCH_FOLDERNAME_BROWSE_LABEL= Browse... -RESID_SEARCH_FOLDERNAME_BROWSE_TOOLTIP= Opens a dialog to select a folder -RESID_SEARCH_INCLUDE_ARCHIVES_LABEL= Search archive files -RESID_SEARCH_INCLUDE_ARCHIVES_TOOLTIP= Specify whether archive files such as zip, jar and tar files should also be searched -RESID_SEARCH_INCLUDE_SUBFOLDERS_LABEL= Search subfolders -RESID_SEARCH_INCLUDE_SUBFOLDERS_TOOLTIP= Specify whether subfolders should also be searched -RESID_SEARCH_CONNECTIONNAMELABEL_LABEL= Connection name: -RESID_SEARCH_CONNECTIONNAMELABEL_TOOLTIP= Connection name -RESID_SEARCH_TARGETGROUP_LABEL= Target -RESID_SEARCH_TARGETGROUP_TOOLTIP= Specify search target -RESID_SEARCH_COLUMNSGROUP_LABEL= Columns -RESID_SEARCH_COLUMNSGROUP_TOOLTIP= Specify columns -RESID_SEARCH_ALLCOLUMNSLABEL_LABEL= All columns -RESID_SEARCH_ALLCOLUMNSLABEL_TOOLTIP= Search all columns -RESID_SEARCH_BETWEENLABEL_LABEL= Between -RESID_SEARCH_ANDLABEL_LABEL= and -RESID_SEARCH_EOLLABEL_LABEL= and end of line -RESID_SEARCH_FIRSTCOLUMN_TOOLTIP= Specify start column -RESID_SEARCH_SECONDCOLUMN_TOOLTIP= Specify end column -RESID_SEARCH_BOTHCOLUMNSLABEL_TOOLTIP= Search between specified columns -RESID_SEARCH_STARTCOLUMNLABEL_TOOLTIP= Search between specified column and end of line - -# Search dialog -RESID_SEARCH_MESSAGE_SEARCHING= Searching... -RESID_SEARCH_MESSAGE_ONEMATCH= %1 match -RESID_SEARCH_MESSAGE_MULTIPLEMATCHES= %1 matches - -################################################################################## -############################ Resource Conflict Dlgs ######################### -################################################################################## -RESID_CONFLICT_SAVE_TITLE= Save Conflict -RESID_CONFLICT_SAVE_MESSAGE= This file has changed on the remote system since it was opened. -RESID_CONFLICT_SAVE_OVERWRITEREMOTE= Overwrite the remote file. -RESID_CONFLICT_SAVE_REPLACELOCAL= Replace contents of editor with remote file. Pending changes will be lost. -RESID_CONFLICT_SAVE_SAVETODIFFERENT= Save the contents of the editor to a different remote file. - -RESID_CONFLICT_DOWNLOAD_TITLE= Local Changes Pending -RESID_CONFLICT_DOWNLOAD_MESSAGE_LOCALCHANGED= This file has pending changes that have not been saved to the remote system. -RESID_CONFLICT_DOWNLOAD_MESSAGE_REMOTECHANGED= This file has pending changes that have not been saved to the remote system and the file has changed on the remote system. -RESID_CONFLICT_DOWNLOAD_REPLACELOCAL= Replace pending changes with remote file -RESID_CONFLICT_DOWNLOAD_OPENWITHLOCAL= Open editor with pending changes - -#============================================================== -# REMOTE FILE SYSTEM CACHE PREFERENCE PAGE -#============================================================= -RESID_PREF_CACHE_DESCRIPTION=When RSE is used for editing, the remote files are cached. Use this page to clear or limit the size of the file cache. -RESID_PREF_CACHE_CLEAR=Clear Cached Files -RESID_PREF_CACHE_CLEAR_LABEL=Clear cached files -RESID_PREF_CACHE_CLEAR_TOOLTIP=Delete remote files that have been cached in the local workspace -RESID_PREF_CACHE_MAX_CACHE_SIZE_LABEL=Maximum cache size (MB) -RESID_PREF_CACHE_MAX_CACHE_SIZE_DESCRIPTION=Enter the maxium size space that can be used by the cache -RESID_PREF_CACHE_MAX_CACHE_SIZE_TOOLTIP=Enter the maxium size space that can be used by the cache -RESID_PREF_CACHE_CLEAR_WARNING_LABEL=Note: -RESID_PREF_CACHE_CLEAR_WARNING_DESCRIPTION=Note: Clearing the cache closes all open remote files - -#============================================================= -# SUPERTRANSFER PROGRESS MONITOR -#============================================================= -RESID_SUPERTRANSFER_PROGMON_MAIN=Compressed copy... -RESID_SUPERTRANSFER_PROGMON_SUBTASK_CREATE=Creating temp archive -RESID_SUPERTRANSFER_PROGMON_SUBTASK_POPULATE=Populating temp archive -RESID_SUPERTRANSFER_PROGMON_SUBTASK_TRANSFER=Transferring temp archive -RESID_SUPERTRANSFER_PROGMON_SUBTASK_EXTRACT=Extracting temp archive -RESID_SUPERTRANSFER_PROGMON_ARCHIVE=archive - -#============================================================= -# SUPERTRANSFER PREFERENCE PAGE -#============================================================= -RESID_SUPERTRANSFER_PREFS_ENABLE=Enable fast folder transfer using data compression -RESID_SUPERTRANSFER_PREFS_TYPE_LABEL=Archive type -RESID_SUPERTRANSFER_PREFS_TYPE_TOOLTIP=Select an archive type to use for the transfer - -################################################################################## -############################ Compare menu item ############################# -################################################################################## -ACTION_COMPAREWITH_EACH_LABEL= Each Other -ACTION_COMPAREWITH_EACH_TOOLTIP= Compare remote resources to each other -ACTION_COMPAREWITH_HISTORY_LABEL= Local History... -ACTION_COMPAREWITH_HISTORY_TOOLTIP= Compare the local edition history of this resource - -################################################################################## -############################ Replace menu item ############################# -################################################################################## -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... -#============================================================= -ACTION_NEWFOLDER_LABEL=Folder -ACTION_NEWFOLDER_TOOLTIP=Create a new Folder -ACTION_SELECT_DIRECTORY_LABEL=Browse... -ACTION_SELECT_DIRECTORY_TOOLTIP=Select folder from remote system -ACTION_SELECT_FILE_LABEL=Browse... -ACTION_SELECT_FILE_TOOLTIP=Select file from remote system \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemSelectRemoteFolderAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemSelectRemoteFolderAction.java index 0f6191b2f36..e1eac559f51 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemSelectRemoteFolderAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemSelectRemoteFolderAction.java @@ -17,9 +17,9 @@ package org.eclipse.rse.files.ui.actions; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.rse.core.model.IHost; -import org.eclipse.rse.files.ui.FileResources; import org.eclipse.rse.files.ui.ISystemAddFileListener; import org.eclipse.rse.files.ui.dialogs.SystemSelectRemoteFileOrFolderDialog; +import org.eclipse.rse.internal.files.ui.FileResources; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.ui.actions.SystemBaseDialogAction; import org.eclipse.rse.ui.validators.IValidatorRemoteSelection; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemTempFileListener.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemTempFileListener.java index 2add7db402a..52751779183 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemTempFileListener.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemTempFileListener.java @@ -36,7 +36,7 @@ import org.eclipse.rse.core.filters.ISystemFilterReference; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.subsystems.ISubSystem; -import org.eclipse.rse.files.ui.FileResources; +import org.eclipse.rse.internal.files.ui.FileResources; import org.eclipse.rse.internal.files.ui.resources.SystemRemoteEditManager; import org.eclipse.rse.model.ISystemResourceChangeEvents; import org.eclipse.rse.model.SystemRegistry; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java index 0209ba61583..4f2dc1bdad2 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java @@ -47,7 +47,7 @@ import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.SystemWorkspaceResourceSet; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.files.ui.Activator; -import org.eclipse.rse.files.ui.FileResources; +import org.eclipse.rse.internal.files.ui.FileResources; import org.eclipse.rse.internal.files.ui.resources.SystemRemoteEditManager; import org.eclipse.rse.internal.subsystems.files.core.ISystemFilePreferencesConstants; import org.eclipse.rse.model.SystemRemoteResourceSet; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SaveAsForm.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SaveAsForm.java index 8dd65b702c6..c24aef7570e 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SaveAsForm.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SaveAsForm.java @@ -18,7 +18,7 @@ package org.eclipse.rse.files.ui.widgets; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.rse.core.SystemAdapterHelpers; -import org.eclipse.rse.files.ui.FileResources; +import org.eclipse.rse.internal.files.ui.FileResources; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.ui.ISystemMessages; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemEnterOrSelectRemoteFileForm.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemEnterOrSelectRemoteFileForm.java index 3a2cf0008d8..51988c5d8eb 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemEnterOrSelectRemoteFileForm.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemEnterOrSelectRemoteFileForm.java @@ -18,7 +18,7 @@ package org.eclipse.rse.files.ui.widgets; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.rse.core.SystemAdapterHelpers; -import org.eclipse.rse.files.ui.FileResources; +import org.eclipse.rse.internal.files.ui.FileResources; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.ui.ISystemMessages; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/FileResources.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/FileResources.java similarity index 99% rename from rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/FileResources.java rename to rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/FileResources.java index b97450440de..74774799ae6 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/FileResources.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/FileResources.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.files.ui; +package org.eclipse.rse.internal.files.ui; import org.eclipse.osgi.util.NLS; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemAddToArchiveAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemAddToArchiveAction.java index 66e4a5823a4..2d8fa39283b 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemAddToArchiveAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemAddToArchiveAction.java @@ -28,8 +28,8 @@ import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.rse.core.model.IHost; -import org.eclipse.rse.files.ui.FileResources; import org.eclipse.rse.files.ui.dialogs.AddToArchiveDialog; +import org.eclipse.rse.internal.files.ui.FileResources; import org.eclipse.rse.model.ISystemRemoteChangeEvents; import org.eclipse.rse.model.ISystemResourceChangeEvents; import org.eclipse.rse.model.SystemRegistry; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemCombineAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemCombineAction.java index fcb8d57296f..be3e6f73973 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemCombineAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemCombineAction.java @@ -16,8 +16,8 @@ package org.eclipse.rse.internal.files.ui.actions; import org.eclipse.jface.operation.IRunnableContext; -import org.eclipse.rse.files.ui.FileResources; import org.eclipse.rse.files.ui.dialogs.CombineDialog; +import org.eclipse.rse.internal.files.ui.FileResources; import org.eclipse.rse.model.ISystemRemoteChangeEvents; import org.eclipse.rse.model.ISystemResourceChangeEvents; import org.eclipse.rse.model.SystemRegistry; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemCompareFilesAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemCompareFilesAction.java index 563744a149c..915c6f55684 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemCompareFilesAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemCompareFilesAction.java @@ -23,9 +23,9 @@ import java.util.List; import org.eclipse.compare.CompareConfiguration; import org.eclipse.compare.CompareUI; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.rse.files.ui.FileResources; import org.eclipse.rse.files.ui.compare.SystemCompareInput; import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile; +import org.eclipse.rse.internal.files.ui.FileResources; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.ui.actions.SystemBaseAction; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemCompareWithEditionAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemCompareWithEditionAction.java index 0714def306a..23348bf1a07 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemCompareWithEditionAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemCompareWithEditionAction.java @@ -17,7 +17,7 @@ package org.eclipse.rse.internal.files.ui.actions; import org.eclipse.compare.internal.ICompareContextIds; -import org.eclipse.rse.files.ui.FileResources; +import org.eclipse.rse.internal.files.ui.FileResources; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemConvertAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemConvertAction.java index c9982c9d4fa..ad604645d54 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemConvertAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemConvertAction.java @@ -16,8 +16,8 @@ package org.eclipse.rse.internal.files.ui.actions; import org.eclipse.jface.operation.IRunnableContext; -import org.eclipse.rse.files.ui.FileResources; import org.eclipse.rse.files.ui.dialogs.CombineDialog; +import org.eclipse.rse.internal.files.ui.FileResources; import org.eclipse.rse.model.ISystemRemoteChangeEvents; import org.eclipse.rse.model.ISystemResourceChangeEvents; import org.eclipse.rse.model.SystemRegistry; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemDownloadConflictAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemDownloadConflictAction.java index de80fa18cf1..77b8dc5aaf5 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemDownloadConflictAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemDownloadConflictAction.java @@ -19,8 +19,8 @@ package org.eclipse.rse.internal.files.ui.actions; import org.eclipse.core.resources.IFile; import org.eclipse.jface.window.Window; import org.eclipse.rse.core.SystemBasePlugin; -import org.eclipse.rse.files.ui.FileResources; import org.eclipse.rse.files.ui.resources.SystemIFileProperties; +import org.eclipse.rse.internal.files.ui.FileResources; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.actions.SystemBaseAction; import org.eclipse.rse.ui.dialogs.SystemPromptDialog; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemExtractAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemExtractAction.java index 3e1cbfa6276..83a53d722c1 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemExtractAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemExtractAction.java @@ -26,7 +26,7 @@ import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.rse.files.ui.FileResources; +import org.eclipse.rse.internal.files.ui.FileResources; import org.eclipse.rse.model.ISystemRemoteChangeEvents; import org.eclipse.rse.model.ISystemResourceChangeEvents; import org.eclipse.rse.model.SystemRegistry; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemExtractToAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemExtractToAction.java index 05b3337bc91..b0c2c96bf78 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemExtractToAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemExtractToAction.java @@ -18,8 +18,8 @@ package org.eclipse.rse.internal.files.ui.actions; import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.model.IHost; -import org.eclipse.rse.files.ui.FileResources; import org.eclipse.rse.files.ui.dialogs.ExtractToDialog; +import org.eclipse.rse.internal.files.ui.FileResources; import org.eclipse.rse.model.ISystemRemoteChangeEvents; import org.eclipse.rse.model.ISystemResourceChangeEvents; import org.eclipse.rse.model.SystemRegistry; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemNewFolderAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemNewFolderAction.java index a933ba811b8..1430cfc3944 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemNewFolderAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemNewFolderAction.java @@ -18,7 +18,7 @@ package org.eclipse.rse.internal.files.ui.actions; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.wizard.IWizard; -import org.eclipse.rse.files.ui.FileResources; +import org.eclipse.rse.internal.files.ui.FileResources; import org.eclipse.rse.internal.files.ui.wizards.SystemNewFolderWizard; import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.ISystemIconConstants; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemRemoteFileOpenWithMenu.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemRemoteFileOpenWithMenu.java index 6db1efef245..f246e8bf196 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemRemoteFileOpenWithMenu.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemRemoteFileOpenWithMenu.java @@ -27,10 +27,10 @@ import org.eclipse.jface.action.ContributionItem; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.rse.core.SystemBasePlugin; -import org.eclipse.rse.files.ui.FileResources; import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile; import org.eclipse.rse.files.ui.resources.SystemIFileProperties; import org.eclipse.rse.files.ui.resources.UniversalFileTransferUtility; +import org.eclipse.rse.internal.files.ui.FileResources; import org.eclipse.rse.internal.files.ui.view.DownloadJob; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemRemoteFileSelectAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemRemoteFileSelectAction.java index 9699753884f..98df9d2767e 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemRemoteFileSelectAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemRemoteFileSelectAction.java @@ -17,9 +17,9 @@ package org.eclipse.rse.internal.files.ui.actions; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.rse.core.model.IHost; -import org.eclipse.rse.files.ui.FileResources; import org.eclipse.rse.files.ui.ISystemAddFileListener; import org.eclipse.rse.files.ui.dialogs.SystemRemoteFileDialog; +import org.eclipse.rse.internal.files.ui.FileResources; import org.eclipse.rse.internal.ui.view.SystemActionViewerFilter; import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemReplaceWithEditionAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemReplaceWithEditionAction.java index 37bb7de3c60..128f807498f 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemReplaceWithEditionAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemReplaceWithEditionAction.java @@ -17,7 +17,7 @@ package org.eclipse.rse.internal.files.ui.actions; import org.eclipse.compare.internal.ICompareContextIds; -import org.eclipse.rse.files.ui.FileResources; +import org.eclipse.rse.internal.files.ui.FileResources; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemUploadConflictAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemUploadConflictAction.java index e212465955e..d57f16b36fd 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemUploadConflictAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemUploadConflictAction.java @@ -25,11 +25,11 @@ import org.eclipse.jface.window.Window; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.subsystems.SubSystem; import org.eclipse.rse.core.subsystems.SubSystem.SystemMessageDialogRunnable; -import org.eclipse.rse.files.ui.FileResources; import org.eclipse.rse.files.ui.dialogs.ISaveAsDialog; import org.eclipse.rse.files.ui.dialogs.SaveAsDialog; import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile; import org.eclipse.rse.files.ui.resources.SystemIFileProperties; +import org.eclipse.rse.internal.files.ui.FileResources; import org.eclipse.rse.model.ISystemResourceChangeEvents; import org.eclipse.rse.model.SystemResourceChangeEvent; import org.eclipse.rse.services.clientserver.SystemEncodingUtil; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/DownloadJob.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/DownloadJob.java index 18b4e568a00..f8b2b237b23 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/DownloadJob.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/DownloadJob.java @@ -21,9 +21,9 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.rse.files.ui.FileResources; import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile; import org.eclipse.rse.files.ui.resources.SystemUniversalTempFileListener; +import org.eclipse.rse.internal.files.ui.FileResources; import org.eclipse.rse.ui.view.ISystemEditableRemoteObject; import org.eclipse.swt.widgets.Display; 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 3634d3780a2..47a188b18f4 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 @@ -53,11 +53,11 @@ import org.eclipse.rse.core.model.SystemWorkspaceResourceSet; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.RemoteChildrenContentsType; import org.eclipse.rse.core.subsystems.SubSystem; -import org.eclipse.rse.files.ui.FileResources; import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile; import org.eclipse.rse.files.ui.resources.SystemIFileProperties; import org.eclipse.rse.files.ui.resources.UniversalFileTransferUtility; import org.eclipse.rse.filters.SystemFilterReference; +import org.eclipse.rse.internal.files.ui.FileResources; import org.eclipse.rse.internal.files.ui.actions.SystemAddToArchiveAction; import org.eclipse.rse.internal.files.ui.actions.SystemCompareFilesAction; import org.eclipse.rse.internal.files.ui.actions.SystemCompareWithEditionAction; 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 c4a2d355701..d91449508e7 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 @@ -27,9 +27,9 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.rse.core.SystemAdapterHelpers; import org.eclipse.rse.core.subsystems.ISubSystem; -import org.eclipse.rse.files.ui.FileResources; import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile; import org.eclipse.rse.files.ui.resources.SystemIFileProperties; +import org.eclipse.rse.internal.files.ui.FileResources; import org.eclipse.rse.internal.files.ui.actions.SystemRemoteFileSearchOpenWithMenu; import org.eclipse.rse.internal.ui.view.SystemViewResources; import org.eclipse.rse.services.search.IHostSearchResult;