From 14be9af20989b7fa246a3ad5355f3bbe6e5e1c1c Mon Sep 17 00:00:00 2001
From: David McKnight <dmcknigh@ca.ibm.com>
Date: Fri, 25 May 2007 15:47:55 +0000
Subject: [PATCH] in refresh remote, only change to use parent of a leaf if the
parent exists
---
.../rse/internal/ui/view/SystemView.java | 22 ++++++++++++-------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java
index 2680c3a879a..e6ca3d2a3e5 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java
@@ -2103,7 +2103,11 @@ public class SystemView extends SafeTreeViewer
if (!hasChildren)
{
// make the src the parent of the src
- src = adapter.getParent(src);
+ Object srcParent = adapter.getParent(src);
+ if (srcParent != null)
+ {
+ src = srcParent;
+ }
}
else
{
@@ -2126,13 +2130,15 @@ public class SystemView extends SafeTreeViewer
Object srcParent = adapter.getParent(src); // get parent before we query
// because if after query src doesn't exist,
// we can't get parent
-
- src = ss.getObjectWithAbsoluteName(key);
- hasChildren = adapter.hasChildren((IAdaptable)src);
- if (!hasChildren)
- {
- // make the src the parent of the src
- src = srcParent;
+ if (srcParent != null)
+ {
+ src = ss.getObjectWithAbsoluteName(key);
+ hasChildren = adapter.hasChildren((IAdaptable)src);
+ if (!hasChildren)
+ {
+ // make the src the parent of the src
+ src = srcParent;
+ }
}
}
catch (Exception e)