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

[389838] Fast folder transfer does not account for code page

Browse source
This commit is contained in:
David McKnight 2012-09-04 15:32:29 +00:00
parent 13a5c97365
commit 5ef709f76d
3 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -64,6 +64,7 @@
* David McKnight (IBM) - [228743] [usability][dnd] Paste into read-only folder fails silently
* David McKnight (IBM) - [376410] cross-system copy/paste operation doesn't transfer remote encodings for binary files
* David McKnight (IBM) - [386486] when the original timestamp of a file is 0 don't set it after an upload
* David McKnight (IBM) - [389838] Fast folder transfer does not account for code page
*******************************************************************************/
package org.eclipse.rse.files.ui.resources;
@ -183,7 +184,8 @@ public class UniversalFileTransferUtility {
*/
private static boolean doSuperTransfer(IRemoteFileSubSystem subsystem)
{
boolean doSuperTransferProperty = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemFilePreferencesConstants.DOSUPERTRANSFER) &&
//boolean doSuperTransferProperty = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemFilePreferencesConstants.DOSUPERTRANSFER) &&
boolean doSuperTransferProperty = false; // disabling due to potential corruption
subsystem.getParentRemoteFileSubSystemConfiguration().supportsArchiveManagement();
return doSuperTransferProperty;
}

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

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2002, 2010 IBM Corporation and others.
* Copyright (c) 2002, 2012 IBM Corporation and others.
* 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
@ -22,6 +22,7 @@
* David McKnight (IBM) - [223204] [cleanup] fix broken nls strings in files.ui and others
* David McKnight (IBM) - [245260] Different user's connections on a single host are mapped to the same temp files cache
* David McKnight (IBM) - [283033] remoteFileTypes extension point should include "xml" type
* David McKnight (IBM) - [389838] Fast folder transfer does not account for code page
*******************************************************************************/
package org.eclipse.rse.internal.files.ui.propertypages;
@ -367,18 +368,21 @@ public class UniversalPreferencePage
});
boolean enableSuperTransfer = false;
// archive transfer
Composite archiveGroup = new Composite(parent, SWT.NULL);
GridLayout alayout = new GridLayout();
alayout.numColumns = 2;
archiveGroup.setLayout(alayout);
archiveGroup.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
archiveGroup.setEnabled(enableSuperTransfer); // set it can be disabled
doSuperTransferButton = SystemWidgetHelpers.createCheckBox(archiveGroup, FileResources.RESID_SUPERTRANSFER_PREFS_ENABLE, this);
GridData cdata = new GridData();
cdata.horizontalSpan = 2;
doSuperTransferButton.setLayoutData(cdata);
doSuperTransferButton.setEnabled(enableSuperTransfer); // so it can be disabled
archiveTypeCombo = SystemWidgetHelpers.createLabeledReadonlyCombo(archiveGroup, null, FileResources.RESID_SUPERTRANSFER_PREFS_TYPE_LABEL, FileResources.RESID_SUPERTRANSFER_PREFS_TYPE_TOOLTIP);
archiveTypeCombo.setItems(ArchiveHandlerManager.getInstance().getRegisteredExtensions());
@ -520,7 +524,8 @@ public class UniversalPreferencePage
String superTransferArcType = store.getString(ISystemFilePreferencesConstants.SUPERTRANSFER_ARC_TYPE);
archiveTypeCombo.setText(superTransferArcType);
boolean doSuperTransfer = store.getBoolean(ISystemFilePreferencesConstants.DOSUPERTRANSFER);
//boolean doSuperTransfer = store.getBoolean(ISystemFilePreferencesConstants.DOSUPERTRANSFER);
boolean doSuperTransfer = false; // disabling due to potential corruption
doSuperTransferButton.setSelection(doSuperTransfer);
// buffer sizes
@ -974,7 +979,8 @@ public class UniversalPreferencePage
public static boolean getDoSuperTransfer()
{
IPreferenceStore store= RSEUIPlugin.getDefault().getPreferenceStore();
return store.getBoolean(ISystemFilePreferencesConstants.DOSUPERTRANSFER);
//return store.getBoolean(ISystemFilePreferencesConstants.DOSUPERTRANSFER);
return false; // disabling due to potential corruption
}
public static int getDownloadBufferSize()

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

@ -77,6 +77,7 @@
* David McKnight (IBM) - [341244] folder selection input to unlocked Remote Systems Details view sometimes fails
* David McKnight (IBM) - [363490] PHP files opening in system editor (Dreamweaver)
* Rick Sawyer (IBM) - [376535] RSE does not respect editor overrides
* David McKnight (IBM) - [389838] Fast folder transfer does not account for code page
*******************************************************************************/
package org.eclipse.rse.internal.files.ui.view;
@ -1821,7 +1822,8 @@ public class SystemViewRemoteFileAdapter
{
boolean supportsSearch = ((IRemoteFileSubSystemConfiguration)set.getSubSystem().getSubSystemConfiguration()).supportsSearch();
boolean doSuperTransferProperty = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemFilePreferencesConstants.DOSUPERTRANSFER);
// boolean doSuperTransferProperty = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemFilePreferencesConstants.DOSUPERTRANSFER);
boolean doSuperTransferProperty = false; // disabling due to potential corruption
if (!doSuperTransferProperty && supportsSearch)
{
//flatset will contain all FILES that will be copied to workspace in UniversalFileTransferUtility and create corresponding folders. Empty folders will be ignored
@ -2176,7 +2178,8 @@ public class SystemViewRemoteFileAdapter
{
if (fromSet instanceof SystemWorkspaceResourceSet)
{
boolean doSuperTransferProperty = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemFilePreferencesConstants.DOSUPERTRANSFER);
//boolean doSuperTransferProperty = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemFilePreferencesConstants.DOSUPERTRANSFER);
boolean doSuperTransferProperty = false; // disabling due to potential corruption
if (!doSuperTransferProperty)
{
SystemWorkspaceResourceSet flatFromSet = new SystemWorkspaceResourceSet();