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

[189441] fix EFS operations on Windows (Local) systems

Browse source
This commit is contained in:
Martin Oberhuber 2007-08-09 10:32:54 +00:00
parent ff7398cc42
commit dbbf03eb95
2 changed files with 49 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
rse/plugins/org.eclipse.rse.efs.ui/src/org/eclipse/rse/internal/efs/ui/RSEFileSystemContributor.java
View file

@ -17,12 +17,14 @@
* - Improve performance by RSEFileStore instance factory and caching IRemoteFile.
* - Also remove unnecessary class RSEFileCache and obsolete branding files.
* Martin Oberhuber (Wind River) - [188360] renamed from plugin org.eclipse.rse.eclipse.filesystem
* Martin Oberhuber (Wind River) - [189441] fix EFS operations on Windows (Local) systems
********************************************************************************/
package org.eclipse.rse.internal.efs.ui;
import java.net.URI;
import java.net.URISyntaxException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.window.Window;
@ -32,8 +34,10 @@ import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.files.ui.dialogs.SystemRemoteFolderDialog;
import org.eclipse.rse.internal.efs.RSEFileStoreImpl;
import org.eclipse.rse.services.clientserver.PathUtility;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
import org.eclipse.rse.ui.messages.SystemMessageDialog;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.ide.fileSystem.FileSystemContributor;
@ -72,27 +76,57 @@ public class RSEFileSystemContributor extends FileSystemContributor {
}
}
IRemoteFile file = (IRemoteFile)selected;
String path = file.getAbsolutePath();
IHost host = dlg.getSelectedConnection();
String hostName = host.getHostName();
IRemoteFile file = (IRemoteFile)selected;
String path = file.getAbsolutePath();
if (host.getSystemType().isWindows()) {
path = path.replace('\\', '/');
}
path = fixPathForURI(path);
try {
return new URI("rse", hostName, path, null); //$NON-NLS-1$
}
catch (Exception e) {
catch (URISyntaxException e) {
SystemMessageDialog.displayErrorMessage(SystemMessageDialog.getDefaultShell(), e.getLocalizedMessage());
}
}
return null;
}
/**
* Adapt a local file system path such that it can be used as
* path in an URI. Converts path delimiters do '/' default
* delimiter, and adds a slash in front if necessary.
* @param path the path to adapt
* @return adapted path
*/
private String fixPathForURI(String path) {
String sep = PathUtility.getSeparator(path);
if (!sep.equals("/")) { //$NON-NLS-1$
path = path.replace(sep.charAt(0), '/');
}
//<adapted from org.eclipse.core.filesystem.URIUtil.toURI() Copyright(c) 2005, 2006 IBM>
final int length = path.length();
StringBuffer pathBuf = new StringBuffer(length + 3);
//There must be a leading slash in a hierarchical URI
if (length > 0 && (path.charAt(0) != '/'))
pathBuf.append('/');
//additional double-slash for UNC paths to distinguish from host separator
if (path.startsWith("//")) //$NON-NLS-1$
pathBuf.append('/').append('/');
pathBuf.append(path);
//</adapted from org.eclipse.core.filesystem.URIUtil.toURI() Copyright(c) 2005, 2006 IBM>
return pathBuf.toString();
}
public URI getURI(String string){
try {
return new URI(string);
}
catch (Exception e) {
catch (URISyntaxException e) {
//Do not show an error or log here, since this method is called repeatedly while typing
}
return null;
}

8
rse/plugins/org.eclipse.rse.efs/src/org/eclipse/rse/internal/efs/RSEFileStore.java
View file

@ -17,6 +17,7 @@
* - Improve performance by RSEFileStore instance factory and caching IRemoteFile.
* - Also remove unnecessary class RSEFileCache and obsolete branding files.
* Martin Oberhuber (Wind River) - [188360] renamed from plugin org.eclipse.rse.eclipse.filesystem
* Martin Oberhuber (Wind River) - [189441] fix EFS operations on Windows (Local) systems
********************************************************************************/
package org.eclipse.rse.internal.efs;
@ -82,6 +83,13 @@ public class RSEFileStore extends FileStore implements IFileStore
_host = host;
_absolutePath = new Path(absolutePath);
_name = _absolutePath.lastSegment();
if (_name == null) {
//Windows Root Drive has no segments but needs a name
_name = _absolutePath.getDevice();
if (_name == null) {
_name = ""; //$NON-NLS-1$
}
}
}
/**