mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-04 06:45:43 +02:00
Code Issues Wiki Activity

[174942] moving getAdapter() to getViewAdapter()

Browse source
This commit is contained in:
David McKnight 2007-02-22 16:58:27 +00:00
parent 5ea61e9a73
commit 7e50c094cf
2 changed files with 32 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -78,7 +78,6 @@ import org.eclipse.rse.core.model.ISystemMessageObject;
import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.core.model.SystemMessageObject; import org.eclipse.rse.core.model.SystemMessageObject;
import org.eclipse.rse.core.references.IRSEBaseReferencingObject; import org.eclipse.rse.core.references.IRSEBaseReferencingObject;
import org.eclipse.rse.core.subsystems.IRemoteObjectIdentifier;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.model.ISystemPromptableObject; import org.eclipse.rse.model.ISystemPromptableObject;
import org.eclipse.rse.model.ISystemRemoteChangeEvent; import org.eclipse.rse.model.ISystemRemoteChangeEvent;
@ -478,7 +477,7 @@ public class SystemView extends SafeTreeViewer implements ISystemTree, ISystemRe
IStructuredSelection s = (IStructuredSelection) event.getSelection(); IStructuredSelection s = (IStructuredSelection) event.getSelection();
Object element = s.getFirstElement(); Object element = s.getFirstElement();
if (element == null) return; if (element == null) return;
ISystemViewElementAdapter adapter = getAdapter(element); ISystemViewElementAdapter adapter = getViewAdapter(element);
boolean alreadyHandled = false; boolean alreadyHandled = false;
if (adapter != null) alreadyHandled = adapter.handleDoubleClick(element); if (adapter != null) alreadyHandled = adapter.handleDoubleClick(element);
if (!alreadyHandled && isExpandable(element)) { if (!alreadyHandled && isExpandable(element)) {
@ -816,8 +815,8 @@ public class SystemView extends SafeTreeViewer implements ISystemTree, ISystemRe
while (elements.hasNext() && !skipAdapterActions) { while (elements.hasNext() && !skipAdapterActions) {
Object element = elements.next(); Object element = elements.next();
if (adapter == null) { if (adapter == null) {
adapter = getAdapter(element); adapter = getViewAdapter(element);
} else if (adapter != getAdapter(element)) { } else if (adapter != getRemoteAdapter(element)) {
// selected elements have different adapters // selected elements have different adapters
skipAdapterActions = true; skipAdapterActions = true;
} }
@ -1047,7 +1046,7 @@ public class SystemView extends SafeTreeViewer implements ISystemTree, ISystemRe
while (enableDelete && elements.hasNext()) { while (enableDelete && elements.hasNext()) {
Object element = elements.next(); Object element = elements.next();
ISystemViewElementAdapter adapter = getAdapter(element); ISystemViewElementAdapter adapter = getViewAdapter(element);
if (adapter == null) continue; if (adapter == null) continue;
if (enableDelete) enableDelete = adapter.showDelete(element) && adapter.canDelete(element); if (enableDelete) enableDelete = adapter.showDelete(element) && adapter.canDelete(element);
} }
@ -1056,7 +1055,7 @@ public class SystemView extends SafeTreeViewer implements ISystemTree, ISystemRe
((SystemCommonDeleteAction) getDeleteAction()).setEnabled(enableDelete); ((SystemCommonDeleteAction) getDeleteAction()).setEnabled(enableDelete);
((SystemCommonSelectAllAction) getSelectAllAction()).setEnabled(enableSelectAll(sel)); // added by Phil. Noticed Edit->Select All not enabled when it should be ((SystemCommonSelectAllAction) getSelectAllAction()).setEnabled(enableSelectAll(sel)); // added by Phil. Noticed Edit->Select All not enabled when it should be
ISystemViewElementAdapter adapter = getAdapter(firstSelection); ISystemViewElementAdapter adapter = getViewAdapter(firstSelection);
if (adapter != null) { if (adapter != null) {
displayMessage(adapter.getStatusLineText(firstSelection)); displayMessage(adapter.getStatusLineText(firstSelection));
if ((mouseButtonPressed == LEFT_BUTTON) && (!expandingTreeOnly)) //d40615 if ((mouseButtonPressed == LEFT_BUTTON) && (!expandingTreeOnly)) //d40615
@ -1255,7 +1254,7 @@ public class SystemView extends SafeTreeViewer implements ISystemTree, ISystemRe
* object. Returns null if the adapter is not defined or the * object. Returns null if the adapter is not defined or the
* object is not adaptable. * object is not adaptable.
*/ */
protected ISystemViewElementAdapter getAdapter(Object o) { protected ISystemViewElementAdapter getViewAdapter(Object o) {
ISystemViewInputProvider provider = getInputProvider(); ISystemViewInputProvider provider = getInputProvider();
@ -1277,13 +1276,13 @@ public class SystemView extends SafeTreeViewer implements ISystemTree, ISystemRe
*/ */
protected ISystemRemoteElementAdapter getRemoteAdapter(Object o) protected ISystemRemoteElementAdapter getRemoteAdapter(Object o)
{ {
return (ISystemRemoteElementAdapter)((IAdaptable)o).getAdapter(ISystemRemoteElementAdapter.class); if (o instanceof IAdaptable)
{
return (ISystemRemoteElementAdapter)((IAdaptable)o).getAdapter(ISystemRemoteElementAdapter.class);
}
return null;
} }
protected ISystemViewElementAdapter getViewAdapter(Object o)
{
return SystemAdapterHelpers.getAdapter(o, this);
}
/** /**
* *
@ -1891,7 +1890,7 @@ public class SystemView extends SafeTreeViewer implements ISystemTree, ISystemRe
while (i.hasNext()) { while (i.hasNext()) {
Object element = i.next(); Object element = i.next();
ISystemViewElementAdapter adapter = _originatingViewer.getAdapter(element); ISystemViewElementAdapter adapter = _originatingViewer.getViewAdapter(element);
if ((parentElementItem == null) && (adapter != null) && (!adapter.hasChildren((IAdaptable)element))) { if ((parentElementItem == null) && (adapter != null) && (!adapter.hasChildren((IAdaptable)element))) {
//parentItem = getParentItem((Item)findItem(element)); //parentItem = getParentItem((Item)findItem(element));
parentItem = getParentItem(items[itemIdx]); parentItem = getParentItem(items[itemIdx]);
@ -1944,7 +1943,7 @@ public class SystemView extends SafeTreeViewer implements ISystemTree, ISystemRe
Vector selRemoteObjects = new Vector(); Vector selRemoteObjects = new Vector();
if (j.hasNext()) { if (j.hasNext()) {
Object element = j.next(); Object element = j.next();
ISystemViewElementAdapter adapter = _originatingViewer.getAdapter(element); ISystemViewElementAdapter adapter = _originatingViewer.getViewAdapter(element);
if (adapter != null) { if (adapter != null) {
Item parItem = getParentItem((Item) findItem(element)); Item parItem = getParentItem((Item) findItem(element));
@ -2802,10 +2801,6 @@ public class SystemView extends SafeTreeViewer implements ISystemTree, ISystemRe
} }
protected void doOurInternalRefresh(Widget widget, Object element, boolean doStruct, boolean firstCall) { protected void doOurInternalRefresh(Widget widget, Object element, boolean doStruct, boolean firstCall) {
if (debug) {
logDebugMsg("in doOurInternalRefresh on " + getAdapter(element).getName(element)); //$NON-NLS-1$
logDebugMsg("...current selection is " + getFirstSelectionName(getSelection())); //$NON-NLS-1$
}
if (widget instanceof Item) { if (widget instanceof Item) {
if (doStruct) { if (doStruct) {
updatePlus((Item) widget, element); updatePlus((Item) widget, element);
@ -2855,11 +2850,11 @@ public class SystemView extends SafeTreeViewer implements ISystemTree, ISystemRe
Object firstSel = ss.getFirstElement(); Object firstSel = ss.getFirstElement();
String name = null; String name = null;
if (firstSel != null) { if (firstSel != null) {
ISystemViewElementAdapter ra = getViewAdapter(firstSel); ISystemRemoteElementAdapter ra = getRemoteAdapter(firstSel);
if (ra != null) if (ra != null)
name = ra.getAbsoluteName(firstSel); name = ra.getAbsoluteName(firstSel);
else else
name = getAdapter(firstSel).getName(firstSel); name = getViewAdapter(firstSel).getName(firstSel);
} }
return name; return name;
} else } else
@ -3077,7 +3072,7 @@ public class SystemView extends SafeTreeViewer implements ISystemTree, ISystemRe
// ...if this selected item is expanded, recursively gather up all its expanded descendents // ...if this selected item is expanded, recursively gather up all its expanded descendents
Object data = currItem.getData(); Object data = currItem.getData();
ISystemViewElementAdapter adapter = null; ISystemViewElementAdapter adapter = null;
if (data != null) adapter = getAdapter(data); if (data != null) adapter = getViewAdapter(data);
//if (adapter instanceof ISystemRemoteElementAdapter) { //if (adapter instanceof ISystemRemoteElementAdapter) {
// anyGivenItemsRemote = true; // anyGivenItemsRemote = true;
//} //}
@ -3163,7 +3158,7 @@ public class SystemView extends SafeTreeViewer implements ISystemTree, ISystemRe
TreeItem currItem = roots[idx]; TreeItem currItem = roots[idx];
Object data = currItem.getData(); Object data = currItem.getData();
ISystemViewElementAdapter adapter = null; ISystemViewElementAdapter adapter = null;
if (data != null) adapter = getAdapter(data); if (data != null) adapter = getViewAdapter(data);
if (currItem.getExpanded() && (adapter != null) && adapter.isPromptable(data)) if (currItem.getExpanded() && (adapter != null) && adapter.isPromptable(data))
setExpandedState(data, false); setExpandedState(data, false);
else if (currItem.getExpanded()) { else if (currItem.getExpanded()) {
@ -3271,7 +3266,7 @@ public class SystemView extends SafeTreeViewer implements ISystemTree, ISystemRe
TreeItem currChild = itemChildren[idx]; TreeItem currChild = itemChildren[idx];
Object data = currChild.getData(); Object data = currChild.getData();
ISystemViewElementAdapter adapter = null; ISystemViewElementAdapter adapter = null;
if (data != null) adapter = getAdapter(data); if (data != null) adapter = getViewAdapter(data);
if (currChild.getExpanded() && (adapter != null) && adapter.isPromptable(data)) if (currChild.getExpanded() && (adapter != null) && adapter.isPromptable(data))
setExpandedState(data, false); setExpandedState(data, false);
else if (currChild.getExpanded()) { else if (currChild.getExpanded()) {
@ -4212,7 +4207,7 @@ public class SystemView extends SafeTreeViewer implements ISystemTree, ISystemRe
while (elements.hasNext()) { while (elements.hasNext()) {
Object element = elements.next(); Object element = elements.next();
ISystemViewElementAdapter adapter = getAdapter(element); ISystemViewElementAdapter adapter = getViewAdapter(element);
if (adapter == null) continue; if (adapter == null) continue;
if (selectionShowRefreshAction) selectionShowRefreshAction = adapter.showRefresh(element); if (selectionShowRefreshAction) selectionShowRefreshAction = adapter.showRefresh(element);
@ -4361,7 +4356,7 @@ public class SystemView extends SafeTreeViewer implements ISystemTree, ISystemRe
while (ok && elements.hasNext()) { while (ok && elements.hasNext()) {
element = elements.next(); element = elements.next();
//multiSource[idx++] = element; //multiSource[idx++] = element;
adapter = getAdapter(element); adapter = getViewAdapter(element);
if (getRemoteAdapter(element) != null) continue; if (getRemoteAdapter(element) != null) continue;
ok = adapter.doDelete(getShell(), element, monitor); ok = adapter.doDelete(getShell(), element, monitor);
if (ok) { if (ok) {
@ -4413,7 +4408,7 @@ public class SystemView extends SafeTreeViewer implements ISystemTree, ISystemRe
while (iter.hasNext()) { while (iter.hasNext()) {
Object obj = iter.next(); Object obj = iter.next();
ISystemViewElementAdapter adp = getAdapter(obj); ISystemViewElementAdapter adp = getViewAdapter(obj);
Object parent = adp.getParent(obj); Object parent = adp.getParent(obj);
if ((parent != null) && !(refreshedList.contains(parent))) { if ((parent != null) && !(refreshedList.contains(parent))) {
@ -4475,18 +4470,20 @@ public class SystemView extends SafeTreeViewer implements ISystemTree, ISystemRe
Object element = null; Object element = null;
Object parentElement = getSelectedParent(); Object parentElement = getSelectedParent();
ISystemViewElementAdapter adapter = null; ISystemViewElementAdapter adapter = null;
ISystemViewElementAdapter remoteAdapter = null; ISystemRemoteElementAdapter remoteAdapter = null;
String oldFullName = null; String oldFullName = null;
boolean ok = true; boolean ok = true;
try { try {
int nameIdx = 0; int nameIdx = 0;
while (ok && elements.hasNext()) { while (ok && elements.hasNext()) {
element = elements.next(); element = elements.next();
adapter = getAdapter(element); adapter = getViewAdapter(element);
remoteAdapter = getViewAdapter(element); remoteAdapter = getRemoteAdapter(element);
if (remoteAdapter != null) oldFullName = remoteAdapter.getAbsoluteName(element); // pre-rename if (remoteAdapter != null)
oldFullName = remoteAdapter.getAbsoluteName(element); // pre-rename
ok = adapter.doRename(getShell(), element, newNames[nameIdx++]); ok = adapter.doRename(getShell(), element, newNames[nameIdx++]);
if (ok) { if (ok)
{
if (remoteAdapter != null) if (remoteAdapter != null)
{ {
ISubSystem ss = adapter.getSubSystem(element); ISubSystem ss = adapter.getSubSystem(element);

8
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java
View file

@ -1006,7 +1006,7 @@ public class SystemViewPart
for (int i = 0; i < expandedElements.length; i++) for (int i = 0; i < expandedElements.length; i++)
{ {
Object o = expandedElements[i]; Object o = expandedElements[i];
ISystemViewElementAdapter adapter = systemView.getAdapter(o); ISystemViewElementAdapter adapter = systemView.getViewAdapter(o);
//ISystemRemoteElementAdapter radapter = systemView.getRemoteAdapter(o); //ISystemRemoteElementAdapter radapter = systemView.getRemoteAdapter(o);
//if (adapter.saveExpansionState(o) && (radapter==null)) //if (adapter.saveExpansionState(o) && (radapter==null))
if (adapter.saveExpansionState(o)) if (adapter.saveExpansionState(o))
@ -1026,7 +1026,7 @@ public class SystemViewPart
for (int i = 0; i < elements.length; i++) for (int i = 0; i < elements.length; i++)
{ {
Object o = elements[i]; Object o = elements[i];
ISystemViewElementAdapter adapter = systemView.getAdapter(o); ISystemViewElementAdapter adapter = systemView.getViewAdapter(o);
//ISystemRemoteElementAdapter radapter = systemView.getRemoteAdapter(o); //ISystemRemoteElementAdapter radapter = systemView.getRemoteAdapter(o);
//if (adapter.saveExpansionState(o) && (radapter==null)) //if (adapter.saveExpansionState(o) && (radapter==null))
if (adapter.saveExpansionState(o)) if (adapter.saveExpansionState(o))
@ -1061,7 +1061,7 @@ public class SystemViewPart
for (int idx = elementNodes.length - 1; idx >= 0; idx--) for (int idx = elementNodes.length - 1; idx >= 0; idx--)
{ {
o = elementNodes[idx]; o = elementNodes[idx];
adapter = systemView.getAdapter(o); adapter = systemView.getViewAdapter(o);
idBuffer.append(MEMENTO_DELIM + adapter.getMementoHandle(o)); idBuffer.append(MEMENTO_DELIM + adapter.getMementoHandle(o));
} }
} }
@ -1808,7 +1808,7 @@ public class SystemViewPart
{ {
//System.out.println("INSIDE SAVEINPUTSTATE IN SYSTEMVIEWPART"); //System.out.println("INSIDE SAVEINPUTSTATE IN SYSTEMVIEWPART");
IAdaptable inputObj = getSite().getPage().getInput(); IAdaptable inputObj = getSite().getPage().getInput();
ISystemViewElementAdapter adapter = systemView.getAdapter(inputObj); ISystemViewElementAdapter adapter = systemView.getViewAdapter(inputObj);
if ((adapter != null) && (adapter.saveExpansionState(inputObj))) if ((adapter != null) && (adapter.saveExpansionState(inputObj)))
{ {
String handle = getInputMementoHandle(inputObj, adapter); String handle = getInputMementoHandle(inputObj, adapter);