mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-28 18:53:20 +02:00
Code Issues Wiki Activity

[231209] fixing compile errors from move from getSystemConnection to getHost

Browse source
This commit is contained in:
David McKnight 2008-05-22 13:24:23 +00:00
parent 68a1eb3356
commit 687edee87d
16 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rse/plugins/org.eclipse.rse.efs.ui/src/org/eclipse/rse/internal/efs/ui/CreateRemoteProjectActionDelegate.java
View file

@ -182,7 +182,7 @@ public class CreateRemoteProjectActionDelegate implements IActionDelegate {
{ {
IWorkspaceRoot root = SystemBasePlugin.getWorkspaceRoot(); IWorkspaceRoot root = SystemBasePlugin.getWorkspaceRoot();
String projectName = directory.getSystemConnection().getAliasName() + '_' + directory.getName(); String projectName = directory.getHost().getAliasName() + '_' + directory.getName();
projectName = projectName.replaceAll("[/:*?\"<>|\\\\]", ""); //$NON-NLS-1$ //$NON-NLS-2$ projectName = projectName.replaceAll("[/:*?\"<>|\\\\]", ""); //$NON-NLS-1$ //$NON-NLS-2$
IProject editProject = root.getProject(projectName); IProject editProject = root.getProject(projectName);

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemSelectRemoteFileAction.java
View file

@ -277,7 +277,7 @@ public class SystemSelectRemoteFileAction extends SystemBaseDialogAction
*/ */
public void setRootFolder(IRemoteFile rootFolder) public void setRootFolder(IRemoteFile rootFolder)
{ {
setRootFolder(rootFolder.getSystemConnection(),rootFolder.getAbsolutePath()); setRootFolder(rootFolder.getHost(),rootFolder.getAbsolutePath());
} }
/** /**
* Set a file or folder to preselect. This will: * Set a file or folder to preselect. This will:

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemSelectRemoteFolderAction.java
View file

@ -243,7 +243,7 @@ public class SystemSelectRemoteFolderAction extends SystemBaseDialogAction
*/ */
public void setRootFolder(IRemoteFile rootFolder) public void setRootFolder(IRemoteFile rootFolder)
{ {
setRootFolder(rootFolder.getSystemConnection(),rootFolder.getAbsolutePath()); setRootFolder(rootFolder.getHost(),rootFolder.getAbsolutePath());
} }
/** /**
* Set a file or folder to preselect. This will: * Set a file or folder to preselect. This will:

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java
View file

@ -1382,7 +1382,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
try try
{ {
if (remoteFile.getSystemConnection().getSystemType().isLocal()) if (remoteFile.getHost().getSystemType().isLocal())
{ {
// Open local files "in-place", i.e. don't copy them to the // Open local files "in-place", i.e. don't copy them to the
// RemoteSystemsTempFiles project first // RemoteSystemsTempFiles project first

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

@ -2346,7 +2346,7 @@ public class UniversalFileTransferUtility
String absolutePath = srcFileOrFolder.getAbsolutePath(); String absolutePath = srcFileOrFolder.getAbsolutePath();
if (srcFileOrFolder.getSystemConnection().getSystemType().isLocal()) if (srcFileOrFolder.getHost().getSystemType().isLocal())
{ {
absolutePath = editMgr.getWorkspacePathFor(actualHost, srcFileOrFolder.getAbsolutePath(), srcFileOrFolder.getParentRemoteFileSubSystem()); absolutePath = editMgr.getWorkspacePathFor(actualHost, srcFileOrFolder.getAbsolutePath(), srcFileOrFolder.getParentRemoteFileSubSystem());
} }

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java
View file

@ -733,7 +733,7 @@ public class SystemQualifiedRemoteFolderCombo extends Composite
currFolder = getFolder(); currFolder = getFolder();
} catch (Exception exc) {} } catch (Exception exc) {}
if (currFolder != null) if (currFolder != null)
defaultConnection = currFolder.getSystemConnection(); defaultConnection = currFolder.getHost();
if (browseAction == null) if (browseAction == null)
{ {

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java
View file

@ -372,7 +372,7 @@ public class SystemSelectRemoteFileOrFolderForm
*/ */
public void setRootFolder(IRemoteFile rootFolder) public void setRootFolder(IRemoteFile rootFolder)
{ {
setRootFolder(rootFolder.getSystemConnection(),rootFolder.getAbsolutePath()); setRootFolder(rootFolder.getHost(),rootFolder.getAbsolutePath());
} }
/** /**
* Set a file or folder to preselect. This will: * Set a file or folder to preselect. This will:

6
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemCopyRemoteFileAction.java
View file

@ -258,8 +258,8 @@ implements IValidatorRemoteSelection
targetFolder = (IRemoteFile)targetContainer; targetFolder = (IRemoteFile)targetContainer;
IRemoteFile srcFileOrFolder = (IRemoteFile)oldObject; IRemoteFile srcFileOrFolder = (IRemoteFile)oldObject;
IHost targetConnection = targetFolder.getSystemConnection(); IHost targetConnection = targetFolder.getHost();
IHost srcConnection = srcFileOrFolder.getSystemConnection(); IHost srcConnection = srcFileOrFolder.getHost();
boolean ok = false; boolean ok = false;
if (targetConnection == srcConnection) if (targetConnection == srcConnection)
@ -421,7 +421,7 @@ implements IValidatorRemoteSelection
String dlgTitle = (mode==MODE_COPY ? SystemResources.RESID_COPY_TITLE : SystemResources.RESID_MOVE_TITLE); String dlgTitle = (mode==MODE_COPY ? SystemResources.RESID_COPY_TITLE : SystemResources.RESID_MOVE_TITLE);
firstSelection = getFirstSelectedFile(); firstSelection = getFirstSelectedFile();
sourceConnection = firstSelection.getSystemConnection(); sourceConnection = firstSelection.getHost();
SystemRemoteFolderDialog dlg = new SystemRemoteFolderDialog(shell, dlgTitle, sourceConnection); SystemRemoteFolderDialog dlg = new SystemRemoteFolderDialog(shell, dlgTitle, sourceConnection);
dlg.setNeedsProgressMonitor(true); dlg.setNeedsProgressMonitor(true);
dlg.setMessage(getPromptString()); dlg.setMessage(getPromptString());

4
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/search/SystemSearchPage.java
View file

@ -934,14 +934,14 @@ public class SystemSearchPage extends DialogPage implements ISearchPage {
// if it's a file, but not an archive, get the file name, connection info, and parent folder name // if it's a file, but not an archive, get the file name, connection info, and parent folder name
if (supportsSearch && remoteFile.isFile() && !remoteFile.isArchive()) { if (supportsSearch && remoteFile.isFile() && !remoteFile.isArchive()) {
fileName = remoteFile.getName(); fileName = remoteFile.getName();
IHost conn = remoteFile.getSystemConnection(); IHost conn = remoteFile.getHost();
profileName = conn.getSystemProfileName(); profileName = conn.getSystemProfileName();
connectionName = conn.getAliasName(); connectionName = conn.getAliasName();
folderName = remoteFile.getParentPath(); folderName = remoteFile.getParentPath();
} }
// otherwise if it's a folder or an archive, get the connection info and the name // otherwise if it's a folder or an archive, get the connection info and the name
else if (supportsSearch && (remoteFile.isDirectory() || (remoteFile.isArchive() && supportsArchiveManagement))) { else if (supportsSearch && (remoteFile.isDirectory() || (remoteFile.isArchive() && supportsArchiveManagement))) {
IHost conn = remoteFile.getSystemConnection(); IHost conn = remoteFile.getHost();
profileName = conn.getSystemProfileName(); profileName = conn.getSystemProfileName();
connectionName = conn.getAliasName(); connectionName = conn.getAliasName();
folderName = remoteFile.getAbsolutePath(); folderName = remoteFile.getAbsolutePath();

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/search/SystemSearchRemoteFolderAction.java
View file

@ -196,7 +196,7 @@ public class SystemSearchRemoteFolderAction extends SystemSelectRemoteFolderActi
*/ */
public void setRootFolder(IRemoteFile rootFolder) public void setRootFolder(IRemoteFile rootFolder)
{ {
setRootFolder(rootFolder.getSystemConnection(),rootFolder.getAbsolutePath()); setRootFolder(rootFolder.getHost(),rootFolder.getAbsolutePath());
} }
/** /**
* Set a file or folder to preselect. This will: * Set a file or folder to preselect. This will:

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

@ -2135,7 +2135,7 @@ public class SystemViewRemoteFileAdapter
{ {
String msgTxt = NLS.bind(FileResources.MSG_ERROR_FILE_NOTFOUND, String msgTxt = NLS.bind(FileResources.MSG_ERROR_FILE_NOTFOUND,
srcFileOrFolder.getAbsolutePath(), srcFileOrFolder.getAbsolutePath(),
srcFileOrFolder.getSystemConnection().getAliasName()); srcFileOrFolder.getHost().getAliasName());
SystemMessage errorMessage = new SimpleSystemMessage(Activator.PLUGIN_ID, SystemMessage errorMessage = new SimpleSystemMessage(Activator.PLUGIN_ID,
ISystemFileConstants.MSG_ERROR_FILE_NOTFOUND, ISystemFileConstants.MSG_ERROR_FILE_NOTFOUND,
@ -2545,7 +2545,7 @@ public class SystemViewRemoteFileAdapter
{ {
String msgTxt = NLS.bind(FileResources.MSG_ERROR_FILE_NOTFOUND, String msgTxt = NLS.bind(FileResources.MSG_ERROR_FILE_NOTFOUND,
srcFileOrFolder.getAbsolutePath(), srcFileOrFolder.getAbsolutePath(),
srcFileOrFolder.getSystemConnection().getAliasName()); srcFileOrFolder.getHost().getAliasName());
SystemMessage errorMessage = new SimpleSystemMessage(Activator.PLUGIN_ID, SystemMessage errorMessage = new SimpleSystemMessage(Activator.PLUGIN_ID,
ISystemFileConstants.MSG_ERROR_FILE_NOTFOUND, ISystemFileConstants.MSG_ERROR_FILE_NOTFOUND,

2
rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteFileImportOperation.java
View file

@ -459,7 +459,7 @@ public class RemoteFileImportOperation extends WorkspaceModifyOperation {
return; return;
} }
try { try {
IRemoteFileSubSystem rfss = RemoteFileUtility.getFileSubSystem(((UniFilePlus) fileObject).remoteFile.getSystemConnection()); IRemoteFileSubSystem rfss = RemoteFileUtility.getFileSubSystem(((UniFilePlus) fileObject).remoteFile.getHost());
// 030820: added the following kludge to circumvent problem in // 030820: added the following kludge to circumvent problem in
// artemis. (artemis 3 will fix this) // artemis. (artemis 3 will fix this)
// TODO remove for 6.0 // TODO remove for 6.0

4
rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/Utilities.java
View file

@ -73,7 +73,7 @@ public class Utilities {
* IRemoteFile object. * IRemoteFile object.
*/ */
public static String getAsString(IRemoteFile selectedDirectory) { public static String getAsString(IRemoteFile selectedDirectory) {
return selectedDirectory.getSystemConnection().getSystemProfileName() + '.' + selectedDirectory.getSystemConnection().getAliasName() + ":" + selectedDirectory.getAbsolutePath(); //$NON-NLS-1$ return selectedDirectory.getHost().getSystemProfileName() + '.' + selectedDirectory.getHost().getAliasName() + ":" + selectedDirectory.getAbsolutePath(); //$NON-NLS-1$
} }
/** /**
@ -81,7 +81,7 @@ public class Utilities {
* UniFilePlus object. * UniFilePlus object.
*/ */
public static String getAsString(UniFilePlus selectedDirectory) { public static String getAsString(UniFilePlus selectedDirectory) {
return selectedDirectory.remoteFile.getSystemConnection().getSystemProfileName() + '.' + selectedDirectory.remoteFile.getSystemConnection().getAliasName() + ":" + selectedDirectory.getPath(); //$NON-NLS-1$ return selectedDirectory.remoteFile.getHost().getSystemProfileName() + '.' + selectedDirectory.remoteFile.getHost().getAliasName() + ":" + selectedDirectory.getPath(); //$NON-NLS-1$
} }
/** /**

2
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemCommandAction.java
View file

@ -493,7 +493,7 @@ public class SystemCommandAction extends SystemBaseAction
return _cmdSubSystem; return _cmdSubSystem;
} }
IHost sysConn = selectedFile.getSystemConnection(); IHost sysConn = selectedFile.getHost();
if (sysConn != null) if (sysConn != null)
{ {
ISubSystem currSubSystem = selectedFile.getParentRemoteFileSubSystem(); ISubSystem currSubSystem = selectedFile.getParentRemoteFileSubSystem();

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

@ -352,7 +352,7 @@ public abstract class RemoteFile implements IRemoteFile, IAdaptable, Comparable
*/ */
public String getAbsolutePathPlusConnection() public String getAbsolutePathPlusConnection()
{ {
IHost conn = getSystemConnection(); IHost conn = getHost();
if (conn == null) if (conn == null)
return getAbsolutePath(); return getAbsolutePath();
else else
@ -1127,7 +1127,7 @@ public abstract class RemoteFile implements IRemoteFile, IAdaptable, Comparable
public String getHostName() public String getHostName()
{ {
return getSystemConnection().getHostName(); return getHost().getHostName();
} }

2
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSchedulingRule.java
View file

@ -70,6 +70,6 @@ public class RemoteFileSchedulingRule implements ISchedulingRule
public String getHostName() public String getHostName()
{ {
return _file.getSystemConnection().getHostName(); return _file.getHost().getHostName();
} }
} }