mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-03 23:25:26 +02:00
Code Issues Wiki Activity

[149150] preference page for indication of whether to copy timestamps or not plus some minor refactoring of constants

Browse source
This commit is contained in:
David McKnight 2007-01-09 20:44:52 +00:00
parent f6328835f6
commit 1579f9911b
17 changed files with 171 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
rse/plugins/org.eclipse.rse.eclipse.filesystem/src/org/eclipse/rse/eclipse/filesystem/RSEFileStoreRemoteFileWrapper.java
View file

@ -48,11 +48,11 @@ import org.eclipse.osgi.util.NLS;
import org.eclipse.rse.core.subsystems.RemoteChildrenContentsType;
import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile;
import org.eclipse.rse.files.ui.resources.UniversalFileTransferUtility;
import org.eclipse.rse.internal.subsystems.files.core.ISystemFilePreferencesConstants;
import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileEmpty;
import org.eclipse.rse.ui.ISystemPreferencesConstants;
import org.eclipse.rse.ui.RSEUIPlugin;
@ -77,7 +77,7 @@ public class RSEFileStoreRemoteFileWrapper extends FileStore implements IFileSto
{
IPreferenceStore prefStore = RSEUIPlugin.getDefault().getPreferenceStore();
//boolean origShowHidden = prefStore.getBoolean(ISystemPreferencesConstants.SHOWHIDDEN);
prefStore.setValue(ISystemPreferencesConstants.SHOWHIDDEN, true);
prefStore.setValue(ISystemFilePreferencesConstants.SHOWHIDDEN, true);
String[] names;
if (!_remoteFile.isStale() && _remoteFile.hasContents(RemoteChildrenContentsType.getInstance()))
@ -106,7 +106,7 @@ public class RSEFileStoreRemoteFileWrapper extends FileStore implements IFileSto
names = new String[0];
}
}
prefStore.setValue(ISystemPreferencesConstants.SHOWHIDDEN, false);
prefStore.setValue(ISystemFilePreferencesConstants.SHOWHIDDEN, false);
return names;
}

3
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/FileResources.java
View file

@ -108,6 +108,9 @@ public class FileResources extends NLS
public static String RESID_PREF_UNIVERSAL_FILES_TITLE;
public static String RESID_PREF_UNIVERSAL_SHOWHIDDEN_LABEL;
public static String RESID_PREF_UNIVERSAL_PRESERVE_TIMESTAMPS_LABEL;
public static String RESID_PREF_UNIVERSAL_PRESERVE_TIMESTAMPS_TOOLTIP;
public static String RESID_PREF_UNIVERSAL_FILES_FILETYPES_TYPE_LABEL;
public static String RESID_PREF_UNIVERSAL_FILES_FILETYPES_TYPE_TOOLTIP;

3
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/FileResources.properties
View file

@ -79,6 +79,9 @@ RESID_NEWFOLDER_FOLDER_TIP=Folder in which the new folder will be created
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

16
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/ISystemFileConstants.java
View file

@ -147,12 +147,12 @@ public interface ISystemFileConstants
// -------------------------------
// Enter or select file form
// -------------------------------
public static final String RESID_ENTER_OR_SELECT_FILE_PREFIX = RESID_PREFIX + "EnterOrSelectFile.";
public static final String RESID_ENTER_OR_SELECT_FILE_TITLE = RESID_ENTER_OR_SELECT_FILE_PREFIX + "title";
public static final String RESID_ENTER_OR_SELECT_FILE_VERBIAGE_LABEL = RESID_ENTER_OR_SELECT_FILE_PREFIX + "verbiage.label";
public static final String RESID_ENTER_OR_SELECT_FILE_ENTER_LABEL = RESID_ENTER_OR_SELECT_FILE_PREFIX + "enter.label";
public static final String RESID_ENTER_OR_SELECT_FILE_ENTER_TOOLTIP = RESID_ENTER_OR_SELECT_FILE_PREFIX + "enter.tooltip";
public static final String RESID_ENTER_OR_SELECT_FILE_SELECT_TOOLTIP = RESID_ENTER_OR_SELECT_FILE_PREFIX + "select.tooltip";
public static final String RESID_ENTER_OR_SELECT_FILE_FILE_LABEL = RESID_ENTER_OR_SELECT_FILE_PREFIX + "file.label";
public static final String RESID_ENTER_OR_SELECT_FILE_FILE_TOOLTIP = RESID_ENTER_OR_SELECT_FILE_PREFIX + "file.tooltip";
public static final String RESID_ENTER_OR_SELECT_FILE_PREFIX = RESID_PREFIX + "EnterOrSelectFile."; //$NON-NLS-1$
public static final String RESID_ENTER_OR_SELECT_FILE_TITLE = RESID_ENTER_OR_SELECT_FILE_PREFIX + "title"; //$NON-NLS-1$
public static final String RESID_ENTER_OR_SELECT_FILE_VERBIAGE_LABEL = RESID_ENTER_OR_SELECT_FILE_PREFIX + "verbiage.label"; //$NON-NLS-1$
public static final String RESID_ENTER_OR_SELECT_FILE_ENTER_LABEL = RESID_ENTER_OR_SELECT_FILE_PREFIX + "enter.label"; //$NON-NLS-1$
public static final String RESID_ENTER_OR_SELECT_FILE_ENTER_TOOLTIP = RESID_ENTER_OR_SELECT_FILE_PREFIX + "enter.tooltip"; //$NON-NLS-1$
public static final String RESID_ENTER_OR_SELECT_FILE_SELECT_TOOLTIP = RESID_ENTER_OR_SELECT_FILE_PREFIX + "select.tooltip"; //$NON-NLS-1$
public static final String RESID_ENTER_OR_SELECT_FILE_FILE_LABEL = RESID_ENTER_OR_SELECT_FILE_PREFIX + "file.label"; //$NON-NLS-1$
public static final String RESID_ENTER_OR_SELECT_FILE_FILE_TOOLTIP = RESID_ENTER_OR_SELECT_FILE_PREFIX + "file.tooltip"; //$NON-NLS-1$
}

22
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/propertypages/SystemCachePreferencePage.java
View file

@ -38,10 +38,10 @@ import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.files.ui.FileResources;
import org.eclipse.rse.files.ui.resources.SystemIFileProperties;
import org.eclipse.rse.files.ui.resources.SystemRemoteEditManager;
import org.eclipse.rse.internal.subsystems.files.core.ISystemFilePreferencesConstants;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.GenericMessages;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.ISystemPreferencesConstants;
import org.eclipse.rse.ui.Mnemonics;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemWidgetHelpers;
@ -188,13 +188,13 @@ public class SystemCachePreferencePage extends PreferencePage implements IWorkbe
private void initControls()
{
IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
boolean enableMaxSize = store.getBoolean(ISystemPreferencesConstants.LIMIT_CACHE);
boolean enableMaxSize = store.getBoolean(ISystemFilePreferencesConstants.LIMIT_CACHE);
_maxCacheSize.setEnabled(enableMaxSize);
String maxCacheSizeStr = store.getString(ISystemPreferencesConstants.MAX_CACHE_SIZE);
String maxCacheSizeStr = store.getString(ISystemFilePreferencesConstants.MAX_CACHE_SIZE);
if (maxCacheSizeStr == null || maxCacheSizeStr.equals("")) { //$NON-NLS-1$
maxCacheSizeStr = ISystemPreferencesConstants.DEFAULT_MAX_CACHE_SIZE;
maxCacheSizeStr = ISystemFilePreferencesConstants.DEFAULT_MAX_CACHE_SIZE;
}
_maxCacheSize.setText(maxCacheSizeStr);
@ -218,11 +218,11 @@ public class SystemCachePreferencePage extends PreferencePage implements IWorkbe
IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
boolean enableMaxSize = store.getDefaultBoolean(ISystemPreferencesConstants.LIMIT_CACHE);
boolean enableMaxSize = store.getDefaultBoolean(ISystemFilePreferencesConstants.LIMIT_CACHE);
_maxCacheCheckbox.setSelection(enableMaxSize);
_maxCacheSize.setEnabled(enableMaxSize);
_maxCacheSize.setText(store.getDefaultString(ISystemPreferencesConstants.MAX_CACHE_SIZE));
_maxCacheSize.setText(store.getDefaultString(ISystemFilePreferencesConstants.MAX_CACHE_SIZE));
}
/**
@ -232,8 +232,8 @@ public class SystemCachePreferencePage extends PreferencePage implements IWorkbe
*/
public static void initDefaults(IPreferenceStore store)
{
store.setDefault(ISystemPreferencesConstants.LIMIT_CACHE, ISystemPreferencesConstants.DEFAULT_LIMIT_CACHE);
store.setDefault(ISystemPreferencesConstants.MAX_CACHE_SIZE, ISystemPreferencesConstants.DEFAULT_MAX_CACHE_SIZE);
store.setDefault(ISystemFilePreferencesConstants.LIMIT_CACHE, ISystemFilePreferencesConstants.DEFAULT_LIMIT_CACHE);
store.setDefault(ISystemFilePreferencesConstants.MAX_CACHE_SIZE, ISystemFilePreferencesConstants.DEFAULT_MAX_CACHE_SIZE);
}
/**
@ -245,11 +245,11 @@ public class SystemCachePreferencePage extends PreferencePage implements IWorkbe
String size = _maxCacheSize.getText();
if (size == null || size.trim().equals("")) { //$NON-NLS-1$
size = ISystemPreferencesConstants.DEFAULT_MAX_CACHE_SIZE;
size = ISystemFilePreferencesConstants.DEFAULT_MAX_CACHE_SIZE;
}
store.setValue(ISystemPreferencesConstants.MAX_CACHE_SIZE, size);
store.setValue(ISystemPreferencesConstants.LIMIT_CACHE, _maxCacheCheckbox.getSelection());
store.setValue(ISystemFilePreferencesConstants.MAX_CACHE_SIZE, size);
store.setValue(ISystemFilePreferencesConstants.LIMIT_CACHE, _maxCacheCheckbox.getSelection());
return super.performOk();
}

82
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/propertypages/UniversalPreferencePage.java
View file

@ -30,13 +30,13 @@ import org.eclipse.jface.viewers.ColumnWeightData;
import org.eclipse.jface.viewers.TableLayout;
import org.eclipse.jface.window.Window;
import org.eclipse.rse.files.ui.FileResources;
import org.eclipse.rse.internal.subsystems.files.core.ISystemFilePreferencesConstants;
import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.services.clientserver.messages.SystemMessageFile;
import org.eclipse.rse.subsystems.files.core.model.SystemFileTransferModeMapping;
import org.eclipse.rse.subsystems.files.core.model.SystemFileTransferModeRegistry;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.ISystemPreferencesConstants;
import org.eclipse.rse.ui.Mnemonics;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemWidgetHelpers;
@ -264,16 +264,25 @@ public class UniversalPreferencePage
// Add the boolean field editor for users to choose whether
// hidden files should be displayed
BooleanFieldEditor showHiddenEditor = new BooleanFieldEditor(
ISystemPreferencesConstants.SHOWHIDDEN,
ISystemFilePreferencesConstants.SHOWHIDDEN,
FileResources.RESID_PREF_UNIVERSAL_SHOWHIDDEN_LABEL,
groupComponent);
addField(showHiddenEditor);
IPreferenceStore store= RSEUIPlugin.getDefault().getPreferenceStore();
// field to indicate whether or not to preserve timestamps during copy
BooleanFieldEditor preserveTimestamps = new BooleanFieldEditor(
ISystemFilePreferencesConstants.PRESERVETIMESTAMPS,
FileResources.RESID_PREF_UNIVERSAL_PRESERVE_TIMESTAMPS_LABEL,
parent);
addField(preserveTimestamps);
store.setDefault(ISystemFilePreferencesConstants.PRESERVETIMESTAMPS, true);
// download and upload buffer size
Group transferGroup = new Group(parent, SWT.NULL);
transferGroup.setText(FileResources.RESID_FILES_PREFERENCES_BUFFER);
@ -349,11 +358,11 @@ public class UniversalPreferencePage
boolean doSuperTransfer = getDoSuperTransfer();
doSuperTransferButton.setSelection(doSuperTransfer);
String initialArchiveType = store.getString(ISystemPreferencesConstants.SUPERTRANSFER_ARC_TYPE);
String initialArchiveType = store.getString(ISystemFilePreferencesConstants.SUPERTRANSFER_ARC_TYPE);
if (initialArchiveType == null ||
!ArchiveHandlerManager.getInstance().isRegisteredArchive("test." + initialArchiveType)) //$NON-NLS-1$
{
initialArchiveType = ISystemPreferencesConstants.DEFAULT_SUPERTRANSFER_ARCHIVE_TYPE;
initialArchiveType = ISystemFilePreferencesConstants.DEFAULT_SUPERTRANSFER_ARCHIVE_TYPE;
}
archiveTypeCombo.setText(initialArchiveType);
archiveTypeCombo.setTextLimit(6);
@ -390,11 +399,12 @@ public class UniversalPreferencePage
public static void initDefaults(IPreferenceStore store)
{
store.setDefault(ISystemPreferencesConstants.SHOWHIDDEN, false);
store.setDefault(ISystemPreferencesConstants.DOSUPERTRANSFER, ISystemPreferencesConstants.DEFAULT_DOSUPERTRANSFER);
store.setDefault(ISystemPreferencesConstants.SUPERTRANSFER_ARC_TYPE, ISystemPreferencesConstants.DEFAULT_SUPERTRANSFER_ARCHIVE_TYPE);
store.setDefault(ISystemPreferencesConstants.DOWNLOAD_BUFFER_SIZE, ISystemPreferencesConstants.DEFAULT_DOWNLOAD_BUFFER_SIZE);
store.setDefault(ISystemPreferencesConstants.UPLOAD_BUFFER_SIZE, ISystemPreferencesConstants.DEFAULT_DOWNLOAD_BUFFER_SIZE);
store.setDefault(ISystemFilePreferencesConstants.SHOWHIDDEN, false);
store.setDefault(ISystemFilePreferencesConstants.PRESERVETIMESTAMPS, ISystemFilePreferencesConstants.DEFAULT_PRESERVETIMESTAMPS);
store.setDefault(ISystemFilePreferencesConstants.DOSUPERTRANSFER, ISystemFilePreferencesConstants.DEFAULT_DOSUPERTRANSFER);
store.setDefault(ISystemFilePreferencesConstants.SUPERTRANSFER_ARC_TYPE, ISystemFilePreferencesConstants.DEFAULT_SUPERTRANSFER_ARCHIVE_TYPE);
store.setDefault(ISystemFilePreferencesConstants.DOWNLOAD_BUFFER_SIZE, ISystemFilePreferencesConstants.DEFAULT_DOWNLOAD_BUFFER_SIZE);
store.setDefault(ISystemFilePreferencesConstants.UPLOAD_BUFFER_SIZE, ISystemFilePreferencesConstants.DEFAULT_DOWNLOAD_BUFFER_SIZE);
}
@ -427,11 +437,11 @@ public class UniversalPreferencePage
}
int defaultFileTransferMode = getFileTransferModeDefaultPreference();
if (defaultFileTransferMode == ISystemPreferencesConstants.FILETRANSFERMODE_BINARY)
if (defaultFileTransferMode == ISystemFilePreferencesConstants.FILETRANSFERMODE_BINARY)
{
defaultBinaryButton.setSelection(true);
}
else if (defaultFileTransferMode == ISystemPreferencesConstants.FILETRANSFERMODE_TEXT)
else if (defaultFileTransferMode == ISystemFilePreferencesConstants.FILETRANSFERMODE_TEXT)
{
defaultTextButton.setSelection(true);
}
@ -457,8 +467,8 @@ public class UniversalPreferencePage
resourceTypeTable.setRedraw(true);
int defaultFileTransferMode = getFileTransferModeDefaultPreference();
defaultBinaryButton.setSelection(defaultFileTransferMode == ISystemPreferencesConstants.FILETRANSFERMODE_BINARY);
defaultTextButton.setSelection(defaultFileTransferMode == ISystemPreferencesConstants.FILETRANSFERMODE_TEXT);
defaultBinaryButton.setSelection(defaultFileTransferMode == ISystemFilePreferencesConstants.FILETRANSFERMODE_BINARY);
defaultTextButton.setSelection(defaultFileTransferMode == ISystemFilePreferencesConstants.FILETRANSFERMODE_TEXT);
if (resourceTypeTable.getItemCount() > 0)
{
@ -472,16 +482,16 @@ public class UniversalPreferencePage
protected void resetSuperTransferPrefs()
{
archiveTypeCombo.setText(ISystemPreferencesConstants.DEFAULT_SUPERTRANSFER_ARCHIVE_TYPE);
setSuperTransferTypePreference(ISystemPreferencesConstants.DEFAULT_SUPERTRANSFER_ARCHIVE_TYPE);
doSuperTransferButton.setSelection(ISystemPreferencesConstants.DEFAULT_DOSUPERTRANSFER);
setDoSuperTransfer(ISystemPreferencesConstants.DEFAULT_DOSUPERTRANSFER);
archiveTypeCombo.setText(ISystemFilePreferencesConstants.DEFAULT_SUPERTRANSFER_ARCHIVE_TYPE);
setSuperTransferTypePreference(ISystemFilePreferencesConstants.DEFAULT_SUPERTRANSFER_ARCHIVE_TYPE);
doSuperTransferButton.setSelection(ISystemFilePreferencesConstants.DEFAULT_DOSUPERTRANSFER);
setDoSuperTransfer(ISystemFilePreferencesConstants.DEFAULT_DOSUPERTRANSFER);
}
protected void resetBufferSizePrefs()
{
downloadBufferSize.setText(ISystemPreferencesConstants.DEFAULT_DOWNLOAD_BUFFER_SIZE + ""); //$NON-NLS-1$
uploadBufferSize.setText(ISystemPreferencesConstants.DEFAULT_DOWNLOAD_BUFFER_SIZE + ""); //$NON-NLS-1$
downloadBufferSize.setText(ISystemFilePreferencesConstants.DEFAULT_DOWNLOAD_BUFFER_SIZE + ""); //$NON-NLS-1$
uploadBufferSize.setText(ISystemFilePreferencesConstants.DEFAULT_DOWNLOAD_BUFFER_SIZE + ""); //$NON-NLS-1$
}
/**
@ -755,6 +765,8 @@ public class UniversalPreferencePage
protected void performDefaults()
{
super.performDefaults();
resetResourceTypeTable();
resetSuperTransferPrefs();
@ -792,14 +804,14 @@ public class UniversalPreferencePage
((EditorRegistry)editorRegistry).saveAssociations();
// editorRegistry.removePropertyListener(this);
int defaultFileTransferMode = ISystemPreferencesConstants.FILETRANSFERMODE_BINARY;
int defaultFileTransferMode = ISystemFilePreferencesConstants.FILETRANSFERMODE_BINARY;
if (defaultBinaryButton.getSelection())
{
defaultFileTransferMode = ISystemPreferencesConstants.FILETRANSFERMODE_BINARY;
defaultFileTransferMode = ISystemFilePreferencesConstants.FILETRANSFERMODE_BINARY;
}
else
{
defaultFileTransferMode = ISystemPreferencesConstants.FILETRANSFERMODE_TEXT;
defaultFileTransferMode = ISystemFilePreferencesConstants.FILETRANSFERMODE_TEXT;
}
setFileTransferModeDefaultPreference(defaultFileTransferMode);
setDoSuperTransfer(doSuperTransferButton.getSelection());
@ -817,7 +829,7 @@ public class UniversalPreferencePage
public static int getFileTransferModeDefaultPreference()
{
IPreferenceStore store= RSEUIPlugin.getDefault().getPreferenceStore();
return store.getInt(ISystemPreferencesConstants.FILETRANSFERMODEDEFAULT);
return store.getInt(ISystemFilePreferencesConstants.FILETRANSFERMODEDEFAULT);
}
/**
* Set the default file transfer mode to use for unspecified file types
@ -825,7 +837,7 @@ public class UniversalPreferencePage
public static void setFileTransferModeDefaultPreference(int defaultMode)
{
IPreferenceStore store= RSEUIPlugin.getDefault().getPreferenceStore();
store.setValue(ISystemPreferencesConstants.FILETRANSFERMODEDEFAULT,defaultMode);
store.setValue(ISystemFilePreferencesConstants.FILETRANSFERMODEDEFAULT,defaultMode);
savePreferenceStore();
}
@ -835,7 +847,7 @@ public class UniversalPreferencePage
public static String getSuperTransferTypePreference()
{
IPreferenceStore store= RSEUIPlugin.getDefault().getPreferenceStore();
return store.getString(ISystemPreferencesConstants.SUPERTRANSFER_ARC_TYPE);
return store.getString(ISystemFilePreferencesConstants.SUPERTRANSFER_ARC_TYPE);
}
/**
* Set the default as to whether or not to compress directories before remote transfer
@ -843,23 +855,23 @@ public class UniversalPreferencePage
public static void setSuperTransferTypePreference(String type)
{
IPreferenceStore store= RSEUIPlugin.getDefault().getPreferenceStore();
store.setValue(ISystemPreferencesConstants.SUPERTRANSFER_ARC_TYPE,type);
store.setValue(ISystemFilePreferencesConstants.SUPERTRANSFER_ARC_TYPE,type);
savePreferenceStore();
}
public static boolean getDoSuperTransfer()
{
IPreferenceStore store= RSEUIPlugin.getDefault().getPreferenceStore();
return store.getBoolean(ISystemPreferencesConstants.DOSUPERTRANSFER);
return store.getBoolean(ISystemFilePreferencesConstants.DOSUPERTRANSFER);
}
public static int getDownloadBufferSize()
{
IPreferenceStore store= RSEUIPlugin.getDefault().getPreferenceStore();
int result = store.getInt(ISystemPreferencesConstants.DOWNLOAD_BUFFER_SIZE);
int result = store.getInt(ISystemFilePreferencesConstants.DOWNLOAD_BUFFER_SIZE);
if (result == 0)
{
result = ISystemPreferencesConstants.DEFAULT_DOWNLOAD_BUFFER_SIZE;
result = ISystemFilePreferencesConstants.DEFAULT_DOWNLOAD_BUFFER_SIZE;
}
return result;
}
@ -867,10 +879,10 @@ public class UniversalPreferencePage
public static int getUploadBufferSize()
{
IPreferenceStore store= RSEUIPlugin.getDefault().getPreferenceStore();
int result = store.getInt(ISystemPreferencesConstants.UPLOAD_BUFFER_SIZE);
int result = store.getInt(ISystemFilePreferencesConstants.UPLOAD_BUFFER_SIZE);
if (result == 0)
{
result = ISystemPreferencesConstants.DEFAULT_DOWNLOAD_BUFFER_SIZE;
result = ISystemFilePreferencesConstants.DEFAULT_DOWNLOAD_BUFFER_SIZE;
}
return result;
}
@ -878,7 +890,7 @@ public class UniversalPreferencePage
public static void setDoSuperTransfer(boolean flag)
{
IPreferenceStore store= RSEUIPlugin.getDefault().getPreferenceStore();
store.setValue(ISystemPreferencesConstants.DOSUPERTRANSFER,flag);
store.setValue(ISystemFilePreferencesConstants.DOSUPERTRANSFER,flag);
savePreferenceStore();
}
@ -897,7 +909,7 @@ public class UniversalPreferencePage
if (size > 0)
{
IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
store.setValue(ISystemPreferencesConstants.DOWNLOAD_BUFFER_SIZE, size);
store.setValue(ISystemFilePreferencesConstants.DOWNLOAD_BUFFER_SIZE, size);
savePreferenceStore();
}
}
@ -907,7 +919,7 @@ public class UniversalPreferencePage
if (size > 0)
{
IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
store.setValue(ISystemPreferencesConstants.UPLOAD_BUFFER_SIZE, size);
store.setValue(ISystemFilePreferencesConstants.UPLOAD_BUFFER_SIZE, size);
savePreferenceStore();
}
}

10
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteEditManager.java
View file

@ -37,8 +37,8 @@ import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.internal.subsystems.files.core.ISystemFilePreferencesConstants;
import org.eclipse.rse.services.clientserver.SystemEncodingUtil;
import org.eclipse.rse.ui.ISystemPreferencesConstants;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.view.ISystemEditableRemoteObject;
import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
@ -664,14 +664,14 @@ public class SystemRemoteEditManager
{
IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
boolean enableMaxSize = store.getBoolean(ISystemPreferencesConstants.LIMIT_CACHE);
boolean enableMaxSize = store.getBoolean(ISystemFilePreferencesConstants.LIMIT_CACHE);
if (enableMaxSize)
{
int max = Integer.parseInt(ISystemPreferencesConstants.DEFAULT_MAX_CACHE_SIZE) * 1000000;
int max = Integer.parseInt(ISystemFilePreferencesConstants.DEFAULT_MAX_CACHE_SIZE) * 1000000;
// get the cache limit
try {
String maxSize = store.getString(ISystemPreferencesConstants.MAX_CACHE_SIZE);
String maxSize = store.getString(ISystemFilePreferencesConstants.MAX_CACHE_SIZE);
if (maxSize != null && !maxSize.equals("")) { //$NON-NLS-1$
max = Integer.parseInt(maxSize) * 1000000;
@ -679,7 +679,7 @@ public class SystemRemoteEditManager
}
catch (NumberFormatException nfe) {
SystemBasePlugin.logError("Could not get max cache size", nfe); //$NON-NLS-1$
max = Integer.parseInt(ISystemPreferencesConstants.DEFAULT_MAX_CACHE_SIZE) * 1000000;
max = Integer.parseInt(ISystemFilePreferencesConstants.DEFAULT_MAX_CACHE_SIZE) * 1000000;
}
try {

27
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java
View file

@ -48,6 +48,7 @@ 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.subsystems.files.core.ISystemFilePreferencesConstants;
import org.eclipse.rse.model.SystemRemoteResourceSet;
import org.eclipse.rse.services.clientserver.SystemEncodingUtil;
import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager;
@ -66,7 +67,6 @@ import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
import org.eclipse.rse.subsystems.files.core.subsystems.IVirtualRemoteFile;
import org.eclipse.rse.subsystems.files.core.util.ValidatorFileUniqueName;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.ISystemPreferencesConstants;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.dialogs.SystemRenameSingleDialog;
import org.eclipse.rse.ui.messages.SystemMessageDialog;
@ -313,7 +313,7 @@ public class UniversalFileTransferUtility
return null;
}
boolean doSuperTransferProperty = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemPreferencesConstants.DOSUPERTRANSFER);
boolean doSuperTransferProperty = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemFilePreferencesConstants.DOSUPERTRANSFER);
List set = remoteSet.getResourceSet();
@ -763,7 +763,7 @@ public class UniversalFileTransferUtility
{
IResource tempFolder = null;
boolean doSuperTransferProperty = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemPreferencesConstants.DOSUPERTRANSFER);
boolean doSuperTransferProperty = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemFilePreferencesConstants.DOSUPERTRANSFER);
if (doCompressedTransfer && doSuperTransferProperty && !srcFileOrFolder.isRoot()
&& !(srcFileOrFolder.getParentRemoteFileSubSystem().getHost().getSystemType().equals("Local"))) //$NON-NLS-1$
@ -903,7 +903,7 @@ public class UniversalFileTransferUtility
*/
public static SystemRemoteResourceSet copyWorkspaceResourcesToRemote(SystemWorkspaceResourceSet workspaceSet, IRemoteFile targetFolder, IProgressMonitor monitor, boolean checkForCollisions)
{
boolean doSuperTransferPreference = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemPreferencesConstants.DOSUPERTRANSFER)
boolean doSuperTransferPreference = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemFilePreferencesConstants.DOSUPERTRANSFER)
&& targetFolder.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().supportsArchiveManagement();
IRemoteFileSubSystem targetFS = targetFolder.getParentRemoteFileSubSystem();
@ -1032,8 +1032,11 @@ public class UniversalFileTransferUtility
newFilePathList.add(newPath);
// should check preference first
SystemIFileProperties properties = new SystemIFileProperties(srcFileOrFolder);
((FileServiceSubSystem)targetFS).getFileService().setLastModified(monitor, newPathBuf.toString(), name, properties.getRemoteFileTimeStamp());
if (RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemFilePreferencesConstants.PRESERVETIMESTAMPS))
{
SystemIFileProperties properties = new SystemIFileProperties(srcFileOrFolder);
((FileServiceSubSystem)targetFS).getFileService().setLastModified(monitor, newPathBuf.toString(), name, properties.getRemoteFileTimeStamp());
}
}
catch (RemoteFileIOException e)
@ -1229,8 +1232,12 @@ public class UniversalFileTransferUtility
IRemoteFile copiedFile = targetFS.getRemoteFileObject(targetFolder, name);
// should check preference first
SystemIFileProperties properties = new SystemIFileProperties(srcFileOrFolder);
targetFS.setLastModified(monitor, copiedFile, properties.getRemoteFileTimeStamp());
if (RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemFilePreferencesConstants.PRESERVETIMESTAMPS))
{
SystemIFileProperties properties = new SystemIFileProperties(srcFileOrFolder);
targetFS.setLastModified(monitor, copiedFile, properties.getRemoteFileTimeStamp());
}
return copiedFile;
}
@ -1290,7 +1297,7 @@ public class UniversalFileTransferUtility
boolean isTargetLocal = newTargetFolder.getParentRemoteFileSubSystem().getHost().getSystemType().equals("Local"); //$NON-NLS-1$
boolean destInArchive = (newTargetFolder instanceof IVirtualRemoteFile) || newTargetFolder.isArchive();
boolean doSuperTransferPreference = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemPreferencesConstants.DOSUPERTRANSFER);
boolean doSuperTransferPreference = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemFilePreferencesConstants.DOSUPERTRANSFER);
if (doCompressedTransfer && doSuperTransferPreference && !destInArchive && !isTargetLocal)
{
@ -1452,7 +1459,7 @@ public class UniversalFileTransferUtility
{
IPreferenceStore store= RSEUIPlugin.getDefault().getPreferenceStore();
String archiveType = store.getString(ISystemPreferencesConstants.SUPERTRANSFER_ARC_TYPE);
String archiveType = store.getString(ISystemFilePreferencesConstants.SUPERTRANSFER_ARC_TYPE);
if (archiveType == null || !ArchiveHandlerManager.getInstance().isRegisteredArchive("test." + archiveType)) //$NON-NLS-1$
{
archiveType = ".zip"; //$NON-NLS-1$

6
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteFileAdapter.java
View file

@ -71,6 +71,7 @@ import org.eclipse.rse.files.ui.resources.SystemIFileProperties;
import org.eclipse.rse.files.ui.resources.SystemRemoteEditManager;
import org.eclipse.rse.files.ui.resources.UniversalFileTransferUtility;
import org.eclipse.rse.filters.SystemFilterReference;
import org.eclipse.rse.internal.subsystems.files.core.ISystemFilePreferencesConstants;
import org.eclipse.rse.model.ISystemRegistryUI;
import org.eclipse.rse.model.ISystemResourceChangeEvents;
import org.eclipse.rse.model.SystemRegistry;
@ -103,7 +104,6 @@ import org.eclipse.rse.subsystems.files.core.util.ValidatorFileUniqueName;
import org.eclipse.rse.ui.ISystemContextMenuConstants;
import org.eclipse.rse.ui.ISystemIconConstants;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.ISystemPreferencesConstants;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemMenuManager;
import org.eclipse.rse.ui.SystemResources;
@ -1415,7 +1415,7 @@ public class SystemViewRemoteFileAdapter
{
boolean supportsSearch = ((IRemoteFileSubSystemConfiguration)set.getSubSystem().getSubSystemConfiguration()).supportsSearch();
boolean doSuperTransferProperty = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemPreferencesConstants.DOSUPERTRANSFER);
boolean doSuperTransferProperty = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemFilePreferencesConstants.DOSUPERTRANSFER);
if (!doSuperTransferProperty && supportsSearch)
{
SystemRemoteResourceSet flatSet = new SystemRemoteResourceSet(set.getSubSystem(), set.getAdapter());
@ -1717,7 +1717,7 @@ public class SystemViewRemoteFileAdapter
{
if (fromSet instanceof SystemWorkspaceResourceSet)
{
boolean doSuperTransferProperty = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemPreferencesConstants.DOSUPERTRANSFER);
boolean doSuperTransferProperty = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemFilePreferencesConstants.DOSUPERTRANSFER);
if (!doSuperTransferProperty)
{
SystemWorkspaceResourceSet flatFromSet = new SystemWorkspaceResourceSet();

53
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/ISystemFilePreferencesConstants.java Normal file
View file

@ -0,0 +1,53 @@
/********************************************************************************
* 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.
********************************************************************************/
package org.eclipse.rse.internal.subsystems.files.core;
public interface ISystemFilePreferencesConstants
{
public static final String ROOT = "org.eclipse.rse.subsystems.files.core.preferences."; //$NON-NLS-1$
public static final String SHOWHIDDEN = ROOT + "showhidden"; //$NON-NLS-1$
public static final String FILETRANSFERMODEDEFAULT = ROOT + "filetransfermodedefault"; //$NON-NLS-1$
public static final String PRESERVETIMESTAMPS = ROOT + "preservetimestamps"; // $NON-NLS-1$
public static final String LIMIT_CACHE = ROOT + "limit.cache"; //$NON-NLS-1$
public static final String MAX_CACHE_SIZE = ROOT + "max.cache.size"; //$NON-NLS-1$
public static final String DOSUPERTRANSFER = ROOT + "dosupertransfer"; //$NON-NLS-1$
public static final String SUPERTRANSFER_ARC_TYPE = ROOT + "supertransfer.archivetype"; //$NON-NLS-1$
public static final String DOWNLOAD_BUFFER_SIZE = ROOT + "download.buffer.size"; //$NON-NLS-1$
public static final String UPLOAD_BUFFER_SIZE = ROOT + "upload.buffer.size"; //$NON-NLS-1$
public static final boolean DEFAULT_SHOW_HIDDEN = true;
public static final boolean DEFAULT_PRESERVETIMESTAMPS = true;
public static final int DEFAULT_FILETRANSFERMODE = 0;
public static final int FILETRANSFERMODE_BINARY = 0;
public static final int FILETRANSFERMODE_TEXT = 1;
public static final String DEFAULT_SUPERTRANSFER_ARCHIVE_TYPE = "zip"; //$NON-NLS-1$
public static final boolean DEFAULT_DOSUPERTRANSFER = true;
public static final int DEFAULT_DOWNLOAD_BUFFER_SIZE = 40;
public static final boolean DEFAULT_LIMIT_CACHE = false;
public static final String DEFAULT_MAX_CACHE_SIZE = "512"; //$NON-NLS-1$
}

8
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/SystemFileTransferModeRegistry.java
View file

@ -30,9 +30,9 @@ import org.eclipse.core.resources.IFile;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.SystemSorter;
import org.eclipse.rse.internal.subsystems.files.core.ISystemFilePreferencesConstants;
import org.eclipse.rse.services.clientserver.SystemEncodingUtil;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.rse.ui.ISystemPreferencesConstants;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.ui.IEditorRegistry;
import org.eclipse.ui.IFileEditorMapping;
@ -354,7 +354,7 @@ public class SystemFileTransferModeRegistry
public static int getFileTransferModeDefaultPreference()
{
IPreferenceStore store= RSEUIPlugin.getDefault().getPreferenceStore();
return store.getInt(ISystemPreferencesConstants.FILETRANSFERMODEDEFAULT);
return store.getInt(ISystemFilePreferencesConstants.FILETRANSFERMODEDEFAULT);
}
/**
@ -465,11 +465,11 @@ public class SystemFileTransferModeRegistry
// default
int defaultFileTransferMode = getFileTransferModeDefaultPreference();
if (defaultFileTransferMode == ISystemPreferencesConstants.FILETRANSFERMODE_BINARY)
if (defaultFileTransferMode == ISystemFilePreferencesConstants.FILETRANSFERMODE_BINARY)
{
mapping.setAsBinary();
}
else if (defaultFileTransferMode == ISystemPreferencesConstants.FILETRANSFERMODE_TEXT)
else if (defaultFileTransferMode == ISystemFilePreferencesConstants.FILETRANSFERMODE_TEXT)
{
mapping.setAsText();
}

6
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFile.java
View file

@ -34,12 +34,12 @@ import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.model.ISystemContentsType;
import org.eclipse.rse.core.subsystems.IRemoteContainer;
import org.eclipse.rse.core.subsystems.RemoteChildrenContentsType;
import org.eclipse.rse.internal.subsystems.files.core.ISystemFilePreferencesConstants;
import org.eclipse.rse.services.clientserver.StringComparePatternMatcher;
import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager;
import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
import org.eclipse.rse.subsystems.files.core.model.RemoteFileFilterString;
import org.eclipse.rse.subsystems.files.core.model.SystemFileTransferModeRegistry;
import org.eclipse.rse.ui.ISystemPreferencesConstants;
import org.eclipse.rse.ui.RSEUIPlugin;
@ -605,7 +605,7 @@ public abstract class RemoteFile implements IRemoteFile, IAdaptable, Comparable
private Object[] combineAndFilterHidden(Object[] set1, Object[] set2)
{
boolean showHidden = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemPreferencesConstants.SHOWHIDDEN);
boolean showHidden = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemFilePreferencesConstants.SHOWHIDDEN);
ArrayList result = new ArrayList(set1.length + set2.length);
for (int i = 0; i < set1.length; i++)
{
@ -654,7 +654,7 @@ public abstract class RemoteFile implements IRemoteFile, IAdaptable, Comparable
private Object[] filterHidden(Object[] set, boolean checkInstanceOf)
{
boolean showHidden = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemPreferencesConstants.SHOWHIDDEN);
boolean showHidden = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemFilePreferencesConstants.SHOWHIDDEN);
ArrayList result = new ArrayList(set.length);
for (int i = 0; i < set.length; i++)
{

4
rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/model/DStoreFileAdapter.java
View file

@ -22,6 +22,7 @@ import java.util.List;
import org.eclipse.dstore.core.model.DataElement;
import org.eclipse.rse.connectorservice.dstore.DStoreConnectorService;
import org.eclipse.rse.core.subsystems.SubSystem;
import org.eclipse.rse.internal.subsystems.files.core.ISystemFilePreferencesConstants;
import org.eclipse.rse.services.dstore.files.DStoreHostFile;
import org.eclipse.rse.services.dstore.files.DStoreVirtualHostFile;
import org.eclipse.rse.services.files.IHostFile;
@ -30,7 +31,6 @@ import org.eclipse.rse.subsystems.files.core.subsystems.IHostFileToRemoteFileAda
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileContext;
import org.eclipse.rse.subsystems.files.dstore.subsystem.RemoteFilePropertyChangeListener;
import org.eclipse.rse.ui.ISystemPreferencesConstants;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.swt.widgets.Shell;
@ -52,7 +52,7 @@ public class DStoreFileAdapter implements IHostFileToRemoteFileAdapter
public IRemoteFile[] convertToRemoteFiles(FileServiceSubSystem ss, IRemoteFileContext context, IRemoteFile parent, IHostFile[] nodes)
{
registerFilePropertyChangeListener(ss);
boolean showHidden = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemPreferencesConstants.SHOWHIDDEN);
boolean showHidden = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemFilePreferencesConstants.SHOWHIDDEN);
List results = new ArrayList();
for (int i = 0; i < nodes.length; i++)

4
rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/subsystems/files/ftp/model/FTPFileAdapter.java
View file

@ -19,13 +19,13 @@ package org.eclipse.rse.subsystems.files.ftp.model;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.rse.internal.subsystems.files.core.ISystemFilePreferencesConstants;
import org.eclipse.rse.services.files.IHostFile;
import org.eclipse.rse.services.files.ftp.FTPHostFile;
import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem;
import org.eclipse.rse.subsystems.files.core.subsystems.IHostFileToRemoteFileAdapter;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileContext;
import org.eclipse.rse.ui.ISystemPreferencesConstants;
import org.eclipse.rse.ui.RSEUIPlugin;
@ -34,7 +34,7 @@ public class FTPFileAdapter implements IHostFileToRemoteFileAdapter
public IRemoteFile[] convertToRemoteFiles(FileServiceSubSystem ss, IRemoteFileContext context, IRemoteFile parent, IHostFile[] nodes)
{
boolean showHidden = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemPreferencesConstants.SHOWHIDDEN);
boolean showHidden = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemFilePreferencesConstants.SHOWHIDDEN);
List results = new ArrayList();
for (int i = 0; i < nodes.length; i++)

4
rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/model/LocalFileAdapter.java
View file

@ -19,6 +19,7 @@ package org.eclipse.rse.subsystems.files.local.model;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.rse.internal.subsystems.files.core.ISystemFilePreferencesConstants;
import org.eclipse.rse.services.files.IHostFile;
import org.eclipse.rse.services.local.files.LocalHostFile;
import org.eclipse.rse.services.local.files.LocalVirtualHostFile;
@ -26,7 +27,6 @@ import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSyst
import org.eclipse.rse.subsystems.files.core.subsystems.IHostFileToRemoteFileAdapter;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileContext;
import org.eclipse.rse.ui.ISystemPreferencesConstants;
import org.eclipse.rse.ui.RSEUIPlugin;
@ -38,7 +38,7 @@ public class LocalFileAdapter implements IHostFileToRemoteFileAdapter
public IRemoteFile[] convertToRemoteFiles(FileServiceSubSystem ss, IRemoteFileContext context, IRemoteFile parent, IHostFile[] nodes)
{
if (nodes == null) return null;
boolean showHidden = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemPreferencesConstants.SHOWHIDDEN);
boolean showHidden = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemFilePreferencesConstants.SHOWHIDDEN);
List results = new ArrayList();
for (int i = 0; i < nodes.length; i++)

4
rse/plugins/org.eclipse.rse.subsystems.files.ssh/src/org/eclipse/rse/subsystems/files/ssh/SftpFileAdapter.java
View file

@ -19,19 +19,19 @@ package org.eclipse.rse.subsystems.files.ssh;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.rse.internal.subsystems.files.core.ISystemFilePreferencesConstants;
import org.eclipse.rse.services.files.IHostFile;
import org.eclipse.rse.services.ssh.files.SftpHostFile;
import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem;
import org.eclipse.rse.subsystems.files.core.subsystems.IHostFileToRemoteFileAdapter;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileContext;
import org.eclipse.rse.ui.ISystemPreferencesConstants;
import org.eclipse.rse.ui.RSEUIPlugin;
public class SftpFileAdapter implements IHostFileToRemoteFileAdapter {
public IRemoteFile[] convertToRemoteFiles(FileServiceSubSystem ss, IRemoteFileContext context, IRemoteFile parent, IHostFile[] nodes) {
boolean showHidden = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemPreferencesConstants.SHOWHIDDEN);
boolean showHidden = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemFilePreferencesConstants.SHOWHIDDEN);
List results = new ArrayList();
if (nodes!=null) {

22
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemPreferencesConstants.java
View file

@ -35,24 +35,16 @@ public interface ISystemPreferencesConstants
public static final String ORDER_CONNECTIONS = ROOT + "order.connections"; //$NON-NLS-1$
public static final String HISTORY_FOLDER = ROOT + "history.folder"; //$NON-NLS-1$
public static final String HISTORY_QUALIFIED_FOLDER= ROOT + "history.qualified.folder"; //$NON-NLS-1$
public static final String SHOWHIDDEN = ROOT + "showhidden"; //$NON-NLS-1$
public static final String SHOWNEWCONNECTIONPROMPT = ROOT + "shownewconnection"; //$NON-NLS-1$
public static final String REMEMBER_STATE = ROOT + "rememberState"; //$NON-NLS-1$
public static final String USE_DEFERRED_QUERIES = ROOT + "useDeferredQueries"; //$NON-NLS-1$
public static final String RESTORE_STATE_FROM_CACHE = ROOT + "restoreStateFromCache"; //$NON-NLS-1$
public static final String CASCADE_UDAS_BYPROFILE = ROOT + "uda.cascade"; //$NON-NLS-1$
public static final String FILETRANSFERMODEDEFAULT = ROOT + "filetransfermodedefault"; //$NON-NLS-1$
public static final String DAEMON_AUTOSTART = ROOT + "daemon.autostart"; //$NON-NLS-1$
public static final String DAEMON_PORT = ROOT + "daemon.port"; //$NON-NLS-1$
public static final String LIMIT_CACHE = ROOT + "limit.cache"; //$NON-NLS-1$
public static final String MAX_CACHE_SIZE = ROOT + "max.cache.size"; //$NON-NLS-1$
public static final String DOSUPERTRANSFER = ROOT + "dosupertransfer"; //$NON-NLS-1$
public static final String SUPERTRANSFER_ARC_TYPE = ROOT + "supertransfer.archivetype"; //$NON-NLS-1$
public static final String DOWNLOAD_BUFFER_SIZE = ROOT + "download.buffer.size"; //$NON-NLS-1$
public static final String UPLOAD_BUFFER_SIZE = ROOT + "upload.buffer.size"; //$NON-NLS-1$
public static final String VERIFY_CONNECTION = ROOT + "verify.connection"; //$NON-NLS-1$
@ -69,29 +61,21 @@ public interface ISystemPreferencesConstants
public static final String DEFAULT_ORDER_CONNECTIONS = ""; //$NON-NLS-1$
public static final String DEFAULT_HISTORY_FOLDER = ""; //$NON-NLS-1$
public static final boolean DEFAULT_SHOW_HIDDEN = true;
public static final boolean DEFAULT_SHOWNEWCONNECTIONPROMPT = false;
public static final boolean DEFAULT_REMEMBER_STATE = true; // changed in R2. Phil
public static final boolean DEFAULT_RESTORE_STATE_FROM_CACHE = true; // yantzi: artemis 6.0
public static final boolean DEFAULT_CASCADE_UDAS_BYPROFILE = false;
public static final int DEFAULT_FILETRANSFERMODE = 0;
public static final boolean DEFAULT_USE_DEFERRED_QUERIES = true;
public static final String DEFAULT_TEAMPROFILE = "Team"; //$NON-NLS-1$
public static final int FILETRANSFERMODE_BINARY = 0;
public static final int FILETRANSFERMODE_TEXT = 1;
public static final boolean DEFAULT_DAEMON_AUTOSTART = false;
public static final int DEFAULT_DAEMON_PORT = 4300;
public static final boolean DEFAULT_LIMIT_CACHE = false;
public static final String DEFAULT_MAX_CACHE_SIZE = "512"; //$NON-NLS-1$
public static final String DEFAULT_SUPERTRANSFER_ARCHIVE_TYPE = "zip"; //$NON-NLS-1$
public static final boolean DEFAULT_DOSUPERTRANSFER = true;
public static final int DEFAULT_DOWNLOAD_BUFFER_SIZE = 40;
public static final boolean DEFAULT_VERIFY_CONNECTION = true;