mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-03 23:25:26 +02:00
Code Issues Wiki Activity

[172469] fix patch failed to apply to this file but rejection file has not been checked

Browse source
This commit is contained in:
Uwe Stieber 2007-02-02 13:36:26 +00:00
parent f2491d7610
commit 1c056d5cb4
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java
View file

@ -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);
}
/**

10
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java
View file

@ -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);
}
/**