mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-15 04:55:22 +02:00
[235463][ftp][dstore] Incorrect case sensitivity reported on windows-remote
This commit is contained in:
parent
f02280993f
commit
7fd4ac6495
4 changed files with 71 additions and 57 deletions
|
@ -45,6 +45,7 @@
|
|||
* David McKnight (IBM) - [229610] [api] File transfers should use workspace text file encoding
|
||||
* David McKnight (IBM) - [221211] [api][breaking][files] need batch operations to indicate which operations were successful
|
||||
* Radoslav Gerganov (ProSyst) - [230919] IFileService.delete() should not return a boolean
|
||||
* Martin Oberhuber (Wind River) - [235463][ftp][dstore] Incorrect case sensitivity reported on windows-remote
|
||||
*******************************************************************************/
|
||||
|
||||
package org.eclipse.rse.internal.services.dstore.files;
|
||||
|
@ -2023,7 +2024,7 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
|
|||
|
||||
public boolean isCaseSensitive()
|
||||
{
|
||||
return true;
|
||||
return this.unixStyle;
|
||||
}
|
||||
|
||||
public void setLastModified(String parent, String name,
|
||||
|
|
|
@ -76,6 +76,7 @@
|
|||
* Radoslav Gerganov (ProSyst) - [230919] IFileService.delete() should not return a boolean
|
||||
* Martin Oberhuber (Wind River) - [218040] FTP should support permission modification
|
||||
* Martin Oberhuber (Wind River) - [234045] FTP Permission Error Handling
|
||||
* Martin Oberhuber (Wind River) - [235463][ftp][dstore] Incorrect case sensitivity reported on windows-remote
|
||||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.internal.services.files.ftp;
|
||||
|
@ -137,6 +138,7 @@ public class FTPService extends AbstractFileService implements IFTPService, IFil
|
|||
private Mutex _commandMutex = new Mutex();
|
||||
|
||||
private String _userHome;
|
||||
private boolean _caseSensitive = true;
|
||||
private transient String _hostName;
|
||||
private transient String _userId;
|
||||
private transient String _password;
|
||||
|
@ -603,9 +605,7 @@ public class FTPService extends AbstractFileService implements IFTPService, IFil
|
|||
FTPHostFile file = null;
|
||||
if(_commandMutex.waitForLock(monitor, Long.MAX_VALUE))
|
||||
{
|
||||
|
||||
try {
|
||||
|
||||
//try to retrieve the file
|
||||
_ftpClient = getFTPClient();
|
||||
|
||||
|
@ -636,7 +636,6 @@ public class FTPService extends AbstractFileService implements IFTPService, IFil
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// if not found, create new object with non-existing flag
|
||||
|
@ -645,7 +644,6 @@ public class FTPService extends AbstractFileService implements IFTPService, IFil
|
|||
file = new FTPHostFile(remoteParent,fileName, false, false, 0, 0, false);
|
||||
}
|
||||
|
||||
|
||||
} catch (Exception e) {
|
||||
throw new RemoteFileIOException(e);
|
||||
} finally {
|
||||
|
@ -1362,10 +1360,13 @@ public class FTPService extends AbstractFileService implements IFTPService, IFil
|
|||
}
|
||||
}
|
||||
|
||||
public void setIsCaseSensitive(boolean b) {
|
||||
_caseSensitive = b;
|
||||
}
|
||||
|
||||
public boolean isCaseSensitive()
|
||||
{
|
||||
//TODO find out whether remote is case sensitive or not
|
||||
return true;
|
||||
return _caseSensitive;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
* Contributors:
|
||||
* Martin Oberhuber (Wind River) - [168870] refactor org.eclipse.rse.core package of the UI plugin
|
||||
* David Dykstal (IBM) - [222270] clean up interfaces in org.eclipse.rse.core.filters
|
||||
* Martin Oberhuber (Wind River) - [235463][ftp][dstore] Incorrect case sensitivity reported on windows-remote
|
||||
*******************************************************************************/
|
||||
|
||||
package org.eclipse.rse.subsystems.files.dstore;
|
||||
|
@ -28,6 +29,12 @@ import org.eclipse.rse.ui.SystemBasePlugin;
|
|||
public class DStoreWindowsFileSubSystemConfiguration extends DStoreFileSubSystemConfiguration
|
||||
{
|
||||
|
||||
public DStoreWindowsFileSubSystemConfiguration() {
|
||||
super();
|
||||
_isWindows = true;
|
||||
setIsUnixStyle(!_isWindows);
|
||||
}
|
||||
|
||||
protected ISystemFilterPool createDefaultFilterPool(ISystemFilterPoolManager mgr)
|
||||
{
|
||||
ISystemFilterPool pool = null;
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
* David McKnight (IBM) - [196632] [ftp] Passive mode setting does not work
|
||||
* Martin Oberhuber (Wind River) - [204669] Fix ftp path concatenation on systems using backslash separator
|
||||
* Martin Oberhuber (Wind River) - [203500] Support encodings for FTP paths
|
||||
* Martin Oberhuber (Wind River) - [235463][ftp][dstore] Incorrect case sensitivity reported on windows-remote
|
||||
*******************************************************************************/
|
||||
|
||||
package org.eclipse.rse.internal.subsystems.files.ftp.connectorservice;
|
||||
|
@ -61,6 +62,10 @@ public class FTPConnectorService extends StandardConnectorService
|
|||
{
|
||||
super(FTPSubsystemResources.RESID_FTP_CONNECTORSERVICE_NAME,FTPSubsystemResources.RESID_FTP_CONNECTORSERVICE_DESCRIPTION, host, port);
|
||||
_ftpService = new FTPService();
|
||||
if (getHost().getSystemType().isWindows()) {
|
||||
// Configured against a Windows-specific system type
|
||||
_ftpService.setIsCaseSensitive(false);
|
||||
}
|
||||
getPropertySet();
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue