mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-19 14:15:50 +02:00
Code Issues Wiki Activity

fix for a rename problem while investigating [170728]

Browse source
This commit is contained in:
David McKnight 2007-01-26 15:36:29 +00:00
parent c6f4dcc067
commit 281e9cad54
2 changed files with 16 additions and 8 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

@ -39,6 +39,7 @@ import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator; import org.eclipse.jface.action.Separator;
import org.eclipse.jface.viewers.DecoratingLabelProvider; import org.eclipse.jface.viewers.DecoratingLabelProvider;
import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IBaseLabelProvider;
import org.eclipse.jface.viewers.IBasicPropertyConstants; import org.eclipse.jface.viewers.IBasicPropertyConstants;
import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.ILabelDecorator; import org.eclipse.jface.viewers.ILabelDecorator;
@ -2632,17 +2633,20 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour
for (int idx = 0; idx < matches.size(); idx++) { for (int idx = 0; idx < matches.size(); idx++) {
Item match = (Item) matches.elementAt(idx); Item match = (Item) matches.elementAt(idx);
// a reference to this remote object // a reference to this remote object
if ((match instanceof TreeItem) && !((TreeItem) match).isDisposed()) { if ((match instanceof TreeItem) && !((TreeItem) match).isDisposed())
{
Object data = match.getData(); Object data = match.getData();
if (rmtAdapter == null) rmtAdapter = getRemoteAdapter(data);
if (data != renameObject) // not a binary match if (data != renameObject) // not a binary match
{ {
if (rmtAdapter == null) rmtAdapter = getRemoteAdapter(data);
refresh = rmtAdapter.refreshRemoteObject(data, renameObject); // old, new refresh = rmtAdapter.refreshRemoteObject(data, renameObject); // old, new
} else { } else {
refresh = true; refresh = true;
} }
// rename explicitly here (since internalUpdate doesn't seem to have an effect
String newName = rmtAdapter.getName(data);
match.setText(newName);
internalUpdate(match, data, properties); internalUpdate(match, data, properties);

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

@ -39,6 +39,7 @@ import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator; import org.eclipse.jface.action.Separator;
import org.eclipse.jface.viewers.DecoratingLabelProvider; import org.eclipse.jface.viewers.DecoratingLabelProvider;
import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IBaseLabelProvider;
import org.eclipse.jface.viewers.IBasicPropertyConstants; import org.eclipse.jface.viewers.IBasicPropertyConstants;
import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.ILabelDecorator; import org.eclipse.jface.viewers.ILabelDecorator;
@ -2632,17 +2633,20 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour
for (int idx = 0; idx < matches.size(); idx++) { for (int idx = 0; idx < matches.size(); idx++) {
Item match = (Item) matches.elementAt(idx); Item match = (Item) matches.elementAt(idx);
// a reference to this remote object // a reference to this remote object
if ((match instanceof TreeItem) && !((TreeItem) match).isDisposed()) { if ((match instanceof TreeItem) && !((TreeItem) match).isDisposed())
{
Object data = match.getData(); Object data = match.getData();
if (rmtAdapter == null) rmtAdapter = getRemoteAdapter(data);
if (data != renameObject) // not a binary match if (data != renameObject) // not a binary match
{ {
if (rmtAdapter == null) rmtAdapter = getRemoteAdapter(data);
refresh = rmtAdapter.refreshRemoteObject(data, renameObject); // old, new refresh = rmtAdapter.refreshRemoteObject(data, renameObject); // old, new
} else { } else {
refresh = true; refresh = true;
} }
// rename explicitly here (since internalUpdate doesn't seem to have an effect
String newName = rmtAdapter.getName(data);
match.setText(newName);
internalUpdate(match, data, properties); internalUpdate(match, data, properties);