diff --git a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/model/DaytimeResourceAdapter.java b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/model/DaytimeResourceAdapter.java index cf62c43610f..043fd5d8a59 100644 --- a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/model/DaytimeResourceAdapter.java +++ b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/model/DaytimeResourceAdapter.java @@ -57,6 +57,7 @@ public class DaytimeResourceAdapter extends AbstractSystemViewAdapter implements public String getAbsoluteName(Object object) { //Not used since we dont support clipboard copy, rename or filtering + //FIXME absolute name must remain unique for the object over its lifetime return "daytime:"+getText(object); //$NON-NLS-1$ } diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteSearchResultSetAdapter.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteSearchResultSetAdapter.java index 281ea551745..7fe68da691a 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteSearchResultSetAdapter.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteSearchResultSetAdapter.java @@ -179,6 +179,7 @@ public class SystemViewRemoteSearchResultSetAdapter extends AbstractSystemViewAd */ public String getAbsoluteName(Object element) { + //FIXME this is forbidden by the API return null; } diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemViewRemoteOutputAdapter.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemViewRemoteOutputAdapter.java index 944ff918377..9058e28bbf6 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemViewRemoteOutputAdapter.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemViewRemoteOutputAdapter.java @@ -699,6 +699,7 @@ implements ISystemViewElementAdapter, ISystemRemoteElementAdapter String str = getAbsoluteParentName(element); return str + ":" + out.getIndex(); //$NON-NLS-1$ } + //FIXME this should never happen return null; } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewSubSystemAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewSubSystemAdapter.java index 572a9d878bb..75d274b26c5 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewSubSystemAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewSubSystemAdapter.java @@ -150,6 +150,8 @@ public class SystemViewSubSystemAdapter extends AbstractSystemViewAdapter ISubSystem ss = (ISubSystem)element; // DKM - using type instead of name + //FIXME can we guarantee that the serviceType is always different than the subsystemName? + //Or could the two be confused when looking up the subsystem the reverse way? if (ss instanceof IServiceSubSystem) { return ss.getSystemProfileName() + "." + ss.getHostAliasName() + "." + ((IServiceSubSystem)ss).getServiceType(); //$NON-NLS-1$ //$NON-NLS-2$ diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/testsubsystem/TestSubSystemNodeAdapter.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/testsubsystem/TestSubSystemNodeAdapter.java index 986fd2ba9a0..b3d28e40807 100644 --- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/testsubsystem/TestSubSystemNodeAdapter.java +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/testsubsystem/TestSubSystemNodeAdapter.java @@ -81,17 +81,15 @@ public class TestSubSystemNodeAdapter extends AbstractSystemViewAdapter * @see org.eclipse.rse.core.subsystems.IRemoteObjectIdentifier#getAbsoluteName(java.lang.Object) */ public String getAbsoluteName(Object element) { - if (isTestSubSystemNode(element)) { - ITestSubSystemNode node = (ITestSubSystemNode) element; - String absName = node.getName(); + assert isTestSubSystemNode(element); + ITestSubSystemNode node = (ITestSubSystemNode) element; + String absName = node.getName(); + node = node.getParent(); + while (node != null) { + absName = node.getName() + "/" + absName; //$NON-NLS-1$ node = node.getParent(); - while (node != null) { - absName = node.getName() + "/" + absName; //$NON-NLS-1$ - node = node.getParent(); - } - return absName; } - return null; + return absName; } /* (non-Javadoc)