From 1c056d5cb426ea60480a57e30a9336f64749792a Mon Sep 17 00:00:00 2001 From: Uwe Stieber Date: Fri, 2 Feb 2007 13:36:26 +0000 Subject: [PATCH] [172469] fix patch failed to apply to this file but rejection file has not been checked --- .../org/eclipse/rse/internal/ui/view/SystemView.java | 10 +++++----- .../UI/org/eclipse/rse/ui/view/SystemView.java | 10 +++++----- 2 files changed, 10 insertions(+), 10 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 970bb498500..4c1418041dd 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 @@ -14,7 +14,7 @@ * Michael Berger (IBM) - Patch to remove non-standard expand/collapse from menu. * Tobias Schwarz (Wind River) - Fix 166343 getChildCount() counts invalid items * Martin Oberhuber (Wind River) - Improve fix for 166343 getChildCount() - * Uwe Stieber (Wind Rvier) - [172492] Use SafeTreeViewer + * Uwe Stieber (Wind River) - [172492] Use SafeTreeViewer ********************************************************************************/ package org.eclipse.rse.ui.view; @@ -2772,19 +2772,19 @@ public class SystemView extends SafeTreeViewer implements ISystemTree, ISystemRe protected void doUpdateItem(final Item item, Object element) { - super.doUpdateItem(item, element); - // adding this because base eclipse version isn't renaming properly on duplicates ISystemRemoteElementAdapter adapter = getRemoteAdapter(element); - if (adapter != null) + if (adapter != null && item != null && !item.isDisposed()) { String oldText = item.getText(); - String newText = adapter.getName(element); + String newText = adapter.getText(element); if (!oldText.equals(newText)) { item.setText(newText); } } + + super.doUpdateItem(item, element); } /** 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 970bb498500..4c1418041dd 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 @@ -14,7 +14,7 @@ * Michael Berger (IBM) - Patch to remove non-standard expand/collapse from menu. * Tobias Schwarz (Wind River) - Fix 166343 getChildCount() counts invalid items * Martin Oberhuber (Wind River) - Improve fix for 166343 getChildCount() - * Uwe Stieber (Wind Rvier) - [172492] Use SafeTreeViewer + * Uwe Stieber (Wind River) - [172492] Use SafeTreeViewer ********************************************************************************/ package org.eclipse.rse.ui.view; @@ -2772,19 +2772,19 @@ public class SystemView extends SafeTreeViewer implements ISystemTree, ISystemRe protected void doUpdateItem(final Item item, Object element) { - super.doUpdateItem(item, element); - // adding this because base eclipse version isn't renaming properly on duplicates ISystemRemoteElementAdapter adapter = getRemoteAdapter(element); - if (adapter != null) + if (adapter != null && item != null && !item.isDisposed()) { String oldText = item.getText(); - String newText = adapter.getName(element); + String newText = adapter.getText(element); if (!oldText.equals(newText)) { item.setText(newText); } } + + super.doUpdateItem(item, element); } /**