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

[170728] fix for a refresh issue during the rename

Browse source
This commit is contained in:
David McKnight 2007-01-29 18:05:10 +00:00
parent 6e247d6d59
commit 0d2b4d765f
2 changed files with 70 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -39,7 +39,6 @@ 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;
@ -365,7 +364,7 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour
protected void init() { protected void init() {
_setList = new ArrayList(); _setList = new ArrayList();
busyCursor = new Cursor(shell.getDisplay(), SWT.CURSOR_WAIT); busyCursor = new Cursor(shell.getDisplay(), SWT.CURSOR_WAIT);
setUseHashlookup(true); // new for our 2nd release. Attempt to fix 38 minutes to refresh for 15K elements //setUseHashlookup(true); // new for our 2nd release. Attempt to fix 38 minutes to refresh for 15K elements
// set content provider // set content provider
SystemViewLabelAndContentProvider lcProvider = new SystemViewLabelAndContentProvider(); SystemViewLabelAndContentProvider lcProvider = new SystemViewLabelAndContentProvider();
@ -2646,10 +2645,9 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour
} }
// rename explicitly here (since internalUpdate doesn't seem to have an effect // rename explicitly here (since internalUpdate doesn't seem to have an effect
System.out.println("setting name to "+newElementName);
match.setText(newElementName); match.setText(newElementName);
//updateItem(match, renameObject);
//internalUpdate(match, data, properties); internalUpdate(match, data, properties);
//update(data, properties); // for refreshing non-structural properties in viewer when model changes //update(data, properties); // for refreshing non-structural properties in viewer when model changes
//System.out.println("Match found. refresh required? " + refresh); //System.out.println("Match found. refresh required? " + refresh);
@ -2661,7 +2659,8 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour
if (refresh) if (refresh)
{ {
smartRefresh((TreeItem[])matches.toArray(new TreeItem[matches.size()])); // causes duplicates to appear when there are more than one rename objects
//smartRefresh((TreeItem[])matches.toArray(new TreeItem[matches.size()]));
getTree().setSelection(selected); getTree().setSelection(selected);
} }
@ -2771,6 +2770,23 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour
return true; return true;
} }
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)
{
String oldText = item.getText();
String newText = adapter.getName(element);
if (!oldText.equals(newText))
{
item.setText(newText);
}
}
}
/** /**
* Given the result of findAllRemoteItemReferences, scan for first non-filter object * Given the result of findAllRemoteItemReferences, scan for first non-filter object
*/ */
@ -2829,6 +2845,12 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour
logDebugMsg("in doOurInternalRefresh on " + getAdapter(element).getName(element)); //$NON-NLS-1$ logDebugMsg("in doOurInternalRefresh on " + getAdapter(element).getName(element)); //$NON-NLS-1$
logDebugMsg("...current selection is " + getFirstSelectionName(getSelection())); //$NON-NLS-1$ logDebugMsg("...current selection is " + getFirstSelectionName(getSelection())); //$NON-NLS-1$
} }
ISystemViewElementAdapter adapter = getAdapter(element);
if (adapter != null)
{
//String name = adapter.getName(element);
//System.out.println("refreshing "+ ((TreeItem)widget).getText() + " with " + name);
}
SystemElapsedTimer timer = null; SystemElapsedTimer timer = null;
if (doTimings) timer = new SystemElapsedTimer(); if (doTimings) timer = new SystemElapsedTimer();
if (widget instanceof Item) { if (widget instanceof Item) {
@ -3244,6 +3266,11 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour
} }
} }
public void refreshRemote(Object element)
{
smartRefresh(element, true);
}
/** /**
* Do an intelligent refresh of the given element. Can be null for full refresh * Do an intelligent refresh of the given element. Can be null for full refresh
*/ */
@ -5268,11 +5295,11 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour
_setList.add(newSet); _setList.add(newSet);
return newSet; return newSet;
} }
/*
protected boolean usingElementMap() { protected boolean usingElementMap() {
return false; return false;
} }
*/
public void add(Object parentElementOrTreePath, Object[] childElements) { public void add(Object parentElementOrTreePath, Object[] childElements) {
assertElementsNotNull(childElements); assertElementsNotNull(childElements);

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

@ -39,7 +39,6 @@ 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;
@ -365,7 +364,7 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour
protected void init() { protected void init() {
_setList = new ArrayList(); _setList = new ArrayList();
busyCursor = new Cursor(shell.getDisplay(), SWT.CURSOR_WAIT); busyCursor = new Cursor(shell.getDisplay(), SWT.CURSOR_WAIT);
setUseHashlookup(true); // new for our 2nd release. Attempt to fix 38 minutes to refresh for 15K elements //setUseHashlookup(true); // new for our 2nd release. Attempt to fix 38 minutes to refresh for 15K elements
// set content provider // set content provider
SystemViewLabelAndContentProvider lcProvider = new SystemViewLabelAndContentProvider(); SystemViewLabelAndContentProvider lcProvider = new SystemViewLabelAndContentProvider();
@ -2646,10 +2645,9 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour
} }
// rename explicitly here (since internalUpdate doesn't seem to have an effect // rename explicitly here (since internalUpdate doesn't seem to have an effect
System.out.println("setting name to "+newElementName);
match.setText(newElementName); match.setText(newElementName);
//updateItem(match, renameObject);
//internalUpdate(match, data, properties); internalUpdate(match, data, properties);
//update(data, properties); // for refreshing non-structural properties in viewer when model changes //update(data, properties); // for refreshing non-structural properties in viewer when model changes
//System.out.println("Match found. refresh required? " + refresh); //System.out.println("Match found. refresh required? " + refresh);
@ -2661,7 +2659,8 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour
if (refresh) if (refresh)
{ {
smartRefresh((TreeItem[])matches.toArray(new TreeItem[matches.size()])); // causes duplicates to appear when there are more than one rename objects
//smartRefresh((TreeItem[])matches.toArray(new TreeItem[matches.size()]));
getTree().setSelection(selected); getTree().setSelection(selected);
} }
@ -2771,6 +2770,23 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour
return true; return true;
} }
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)
{
String oldText = item.getText();
String newText = adapter.getName(element);
if (!oldText.equals(newText))
{
item.setText(newText);
}
}
}
/** /**
* Given the result of findAllRemoteItemReferences, scan for first non-filter object * Given the result of findAllRemoteItemReferences, scan for first non-filter object
*/ */
@ -2829,6 +2845,12 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour
logDebugMsg("in doOurInternalRefresh on " + getAdapter(element).getName(element)); //$NON-NLS-1$ logDebugMsg("in doOurInternalRefresh on " + getAdapter(element).getName(element)); //$NON-NLS-1$
logDebugMsg("...current selection is " + getFirstSelectionName(getSelection())); //$NON-NLS-1$ logDebugMsg("...current selection is " + getFirstSelectionName(getSelection())); //$NON-NLS-1$
} }
ISystemViewElementAdapter adapter = getAdapter(element);
if (adapter != null)
{
//String name = adapter.getName(element);
//System.out.println("refreshing "+ ((TreeItem)widget).getText() + " with " + name);
}
SystemElapsedTimer timer = null; SystemElapsedTimer timer = null;
if (doTimings) timer = new SystemElapsedTimer(); if (doTimings) timer = new SystemElapsedTimer();
if (widget instanceof Item) { if (widget instanceof Item) {
@ -3244,6 +3266,11 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour
} }
} }
public void refreshRemote(Object element)
{
smartRefresh(element, true);
}
/** /**
* Do an intelligent refresh of the given element. Can be null for full refresh * Do an intelligent refresh of the given element. Can be null for full refresh
*/ */
@ -5268,11 +5295,11 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour
_setList.add(newSet); _setList.add(newSet);
return newSet; return newSet;
} }
/*
protected boolean usingElementMap() { protected boolean usingElementMap() {
return false; return false;
} }
*/
public void add(Object parentElementOrTreePath, Object[] childElements) { public void add(Object parentElementOrTreePath, Object[] childElements) {
assertElementsNotNull(childElements); assertElementsNotNull(childElements);