From 285aba104c136069806673e01af0904139ecb9a3 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Thu, 15 Feb 2007 21:27:10 +0000 Subject: [PATCH] [170728] changing to use IRemoteObjectIdentifier and/or ISystemViewelementAdapter instead of ISystemRemoteElementAdapter in system table view. --- .../org/eclipse/rse/ui/view/SystemTableTreeView.java | 12 +++++++++++- .../UI/org/eclipse/rse/ui/view/SystemTableView.java | 2 +- .../UI/org/eclipse/rse/ui/view/SystemView.java | 3 +-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableTreeView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableTreeView.java index fcf498f58b0..8a6c7811f5b 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableTreeView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableTreeView.java @@ -49,6 +49,7 @@ import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.filters.ISystemFilterReference; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemRegistry; +import org.eclipse.rse.core.subsystems.IRemoteObjectIdentifier; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.model.ISystemRemoteChangeEvent; import org.eclipse.rse.model.ISystemRemoteChangeEvents; @@ -1046,7 +1047,7 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec remoteResourceName = (String) remoteResource; else { - ISystemRemoteElementAdapter ra = getRemoteAdapter(remoteResource); + IRemoteObjectIdentifier ra = getRemoteObjectIdentifier(remoteResource); if (ra == null) return null; remoteResourceName = ra.getAbsoluteName(remoteResource); @@ -1427,6 +1428,15 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec return adapter; } + /** + * Returns the implementation of IRemoteObjectIdentifier for the given + * object. Returns null if this object does not adaptable to this. + */ + protected IRemoteObjectIdentifier getRemoteObjectIdentifier(Object o) + { + return (IRemoteObjectIdentifier)((IAdaptable)o).getAdapter(IRemoteObjectIdentifier.class); + } + /** * Return true if select all should be enabled for the given object. * For a tree view, you should return true if and only if the selected object has children. diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java index 56e041bab0c..85cb3ddf4e1 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java @@ -1155,7 +1155,7 @@ public class SystemTableView remoteResourceName = (String) remoteResource; else { - ISystemRemoteElementAdapter ra = getRemoteAdapter(remoteResource); + IRemoteObjectIdentifier ra = getRemoteObjectIdentifier(remoteResource); if (ra == null) return null; remoteResourceName = ra.getAbsoluteName(remoteResource); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java index b9c1d514152..c90d5336a28 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java @@ -1260,13 +1260,12 @@ public class SystemView extends SafeTreeViewer implements ISystemTree, ISystemRe } /** - * Returns the implementation of ISystemRemoteElement for the given + * Returns the implementation of IRemoteObjectIdentifier for the given * object. Returns null if this object does not adaptable to this. */ protected IRemoteObjectIdentifier getRemoteAdapter(Object o) { return (IRemoteObjectIdentifier)((IAdaptable)o).getAdapter(IRemoteObjectIdentifier.class); - //return SystemAdapterHelpers.getRemoteAdapter(o, this); } protected ISystemViewElementAdapter getViewAdapter(Object o)