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

[207095] Implicit connect on getRemoteFileObject

Browse source
This commit is contained in:
David McKnight 2007-10-25 14:29:37 +00:00
parent 1e7454b343
commit 8ffc652c8c
1 changed files with 32 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystem.java
View file

@ -19,6 +19,7 @@
* Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API
* Martin Oberhuber (Wind River) - [183824] Forward SystemMessageException from IRemoteFileSubsystem * Martin Oberhuber (Wind River) - [183824] Forward SystemMessageException from IRemoteFileSubsystem
* Javier Montalvo Orus (Symbian) - [199773] Default file transfer mode is ignored for some file types * Javier Montalvo Orus (Symbian) - [199773] Default file transfer mode is ignored for some file types
* David McKnight (IBM) - [207095] Implicit connect on getRemoteFileObject
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.subsystems.files.core.servicesubsystem; package org.eclipse.rse.subsystems.files.core.servicesubsystem;
@ -127,11 +128,15 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I
* an unqualified file or folder name and its parent folder object. * an unqualified file or folder name and its parent folder object.
* @param parent Folder containing the folder or file * @param parent Folder containing the folder or file
* @param folderOrFileName Un-qualified folder or file name * @param folderOrFileName Un-qualified folder or file name
* @param monitor the progress monitor
* @return an IRemoteFile object for the file. * @return an IRemoteFile object for the file.
* @see IRemoteFile * @see IRemoteFile
*/ */
public IRemoteFile getRemoteFileObject(IRemoteFile parent, String folderOrFileName, IProgressMonitor monitor) throws SystemMessageException public IRemoteFile getRemoteFileObject(IRemoteFile parent, String folderOrFileName, IProgressMonitor monitor) throws SystemMessageException
{ {
// for bug 207095, implicit connect if the connection is not connected
checkIsConnected();
String fullPath = parent.getAbsolutePath() + getSeparator() + folderOrFileName; String fullPath = parent.getAbsolutePath() + getSeparator() + folderOrFileName;
IRemoteFile file = getCachedRemoteFile(fullPath); IRemoteFile file = getCachedRemoteFile(fullPath);
if (file != null && !file.isStale()) if (file != null && !file.isStale())
@ -147,11 +152,13 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I
* Constructs and returns an IRemoteFile object given a fully-qualified * Constructs and returns an IRemoteFile object given a fully-qualified
* file or folder name. * file or folder name.
* @param folderOrFileName Fully qualified folder or file name * @param folderOrFileName Fully qualified folder or file name
* @param monitor the progress monitor
* @return The constructed IRemoteFile * @return The constructed IRemoteFile
* @see IRemoteFile * @see IRemoteFile
*/ */
public IRemoteFile getRemoteFileObject(String folderOrFileName, IProgressMonitor monitor) throws SystemMessageException public IRemoteFile getRemoteFileObject(String folderOrFileName, IProgressMonitor monitor) throws SystemMessageException
{ {
String fofName = folderOrFileName; String fofName = folderOrFileName;
if (folderOrFileName.length() > 1) if (folderOrFileName.length() > 1)
{ {
@ -162,12 +169,14 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I
return file; return file;
} }
// for bug 207095, implicit connect if the connection is not connected
checkIsConnected();
if (fofName.endsWith(ArchiveHandlerManager.VIRTUAL_SEPARATOR)) if (fofName.endsWith(ArchiveHandlerManager.VIRTUAL_SEPARATOR))
{ {
fofName = fofName.substring(0, fofName.length() - ArchiveHandlerManager.VIRTUAL_SEPARATOR.length()); fofName = fofName.substring(0, fofName.length() - ArchiveHandlerManager.VIRTUAL_SEPARATOR.length());
} }
int j = fofName.indexOf(ArchiveHandlerManager.VIRTUAL_SEPARATOR); int j = fofName.indexOf(ArchiveHandlerManager.VIRTUAL_SEPARATOR);
if (j == -1) if (j == -1)
{ {
@ -184,7 +193,14 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I
} }
if (fofName.equals(".")) { //$NON-NLS-1$ if (fofName.equals(".")) { //$NON-NLS-1$
return getUserHome(); IRemoteFile userHome = getUserHome();
if (userHome == null){
// with 207095, it's possible that we could be trying to get user home when not connected
SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_ERROR_UNEXPECTED);
throw new SystemMessageException(msg);
}
return userHome;
} }
String sep = PathUtility.getSeparator(folderOrFileName); String sep = PathUtility.getSeparator(folderOrFileName);
@ -262,16 +278,21 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I
return root; return root;
} }
IHostFile userHome = getFileService().getUserHome(); IHostFile userHome = getFileService().getUserHome();
// with 207095, it's possible that user is not connected, and that userHome is null
if (userHome == null) {
return null;
}
IRemoteFile parent = null; IRemoteFile parent = null;
if (!userHome.getParentPath().equals(".")) //$NON-NLS-1$ if (!userHome.getParentPath().equals(".")) //$NON-NLS-1$
{ {
try try
{ {
//parent = getRemoteFileObject(userHome.getParentPath()); //parent = getRemoteFileObject(userHome.getParentPath());
} }
catch (Exception e) catch (Exception e)
{ {
} }
} }
root = getHostFileToRemoteFileAdapter().convertToRemoteFile(this, getDefaultContext(), parent, userHome); root = getHostFileToRemoteFileAdapter().convertToRemoteFile(this, getDefaultContext(), parent, userHome);
cacheRemoteFile(root, "."); //$NON-NLS-1$ cacheRemoteFile(root, "."); //$NON-NLS-1$