mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-09 01:55:24 +02:00
Code Issues Wiki Activity

[174942] changed getAdapter() in SystemTableView to getViewAdapter. Changed doDelete() in SystemView to check for remote object

Browse source
This commit is contained in:
David McKnight 2007-02-22 16:47:07 +00:00
parent 5f5148b0d6
commit 5ea61e9a73
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4362,7 +4362,7 @@ public class SystemView extends SafeTreeViewer implements ISystemTree, ISystemRe
element = elements.next(); element = elements.next();
//multiSource[idx++] = element; //multiSource[idx++] = element;
adapter = getAdapter(element); adapter = getAdapter(element);
if (getAdapter(element) != null) continue; if (getRemoteAdapter(element) != null) continue;
ok = adapter.doDelete(getShell(), element, monitor); ok = adapter.doDelete(getShell(), element, monitor);
if (ok) { if (ok) {
anyOk = true; anyOk = true;

34
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java
View file

@ -133,7 +133,7 @@ public class SystemTableView
{ {
public Object getValue(Object element, String property) public Object getValue(Object element, String property)
{ {
ISystemViewElementAdapter adapter = getAdapter(element); ISystemViewElementAdapter adapter = getViewAdapter(element);
adapter.setPropertySourceInput(element); adapter.setPropertySourceInput(element);
Object value = adapter.getPropertyValue(property); Object value = adapter.getPropertyValue(property);
if (value == null) if (value == null)
@ -154,7 +154,7 @@ public class SystemTableView
if (element instanceof TableItem && value != null) if (element instanceof TableItem && value != null)
{ {
Object obj = ((TableItem) element).getData(); Object obj = ((TableItem) element).getData();
ISystemViewElementAdapter adapter = getAdapter(obj); ISystemViewElementAdapter adapter = getViewAdapter(obj);
if (adapter != null) if (adapter != null)
{ {
adapter.setPropertyValue(property, value); adapter.setPropertyValue(property, value);
@ -427,7 +427,7 @@ public class SystemTableView
/** /**
* Convenience method for retrieving the view adapter for an object * Convenience method for retrieving the view adapter for an object
*/ */
protected ISystemViewElementAdapter getAdapter(Object obj) protected ISystemViewElementAdapter getViewAdapter(Object obj)
{ {
ISystemViewElementAdapter adapter = SystemAdapterHelpers.getAdapter(obj, this); ISystemViewElementAdapter adapter = SystemAdapterHelpers.getAdapter(obj, this);
if (adapter != null) if (adapter != null)
@ -445,7 +445,7 @@ public class SystemTableView
if (children != null && children.length > 0) if (children != null && children.length > 0)
{ {
IAdaptable child = (IAdaptable) children[0]; IAdaptable child = (IAdaptable) children[0];
return getAdapter(child); return getViewAdapter(child);
} }
return null; return null;
} }
@ -465,7 +465,7 @@ public class SystemTableView
if (children != null && children.length > 0) if (children != null && children.length > 0)
{ {
IAdaptable child = (IAdaptable) children[0]; IAdaptable child = (IAdaptable) children[0];
return getCustomDescriptors(getAdapter(child)); return getCustomDescriptors(getViewAdapter(child));
} }
return new IPropertyDescriptor[0]; return new IPropertyDescriptor[0];
@ -488,7 +488,7 @@ public class SystemTableView
if (children != null && children.length > 0) if (children != null && children.length > 0)
{ {
IAdaptable child = (IAdaptable) children[0]; IAdaptable child = (IAdaptable) children[0];
return getAdapter(child).getPropertyDescriptors()[0]; return getViewAdapter(child).getPropertyDescriptors()[0];
} }
return null; return null;
@ -1038,7 +1038,7 @@ public class SystemTableView
{ {
Object dchild = remoteResource; Object dchild = remoteResource;
ISystemViewElementAdapter dadapt = getAdapter(dchild); ISystemViewElementAdapter dadapt = getViewAdapter(dchild);
if (dadapt != null) if (dadapt != null)
{ {
ISubSystem dSubSystem = dadapt.getSubSystem(dchild); ISubSystem dSubSystem = dadapt.getSubSystem(dchild);
@ -1052,7 +1052,7 @@ public class SystemTableView
Object existingChild = children[i]; Object existingChild = children[i];
if (existingChild != null) if (existingChild != null)
{ {
ISystemViewElementAdapter eadapt = getAdapter(existingChild); ISystemViewElementAdapter eadapt = getViewAdapter(existingChild);
ISubSystem eSubSystem = eadapt.getSubSystem(existingChild); ISubSystem eSubSystem = eadapt.getSubSystem(existingChild);
if (dSubSystem == eSubSystem) if (dSubSystem == eSubSystem)
@ -1114,7 +1114,7 @@ public class SystemTableView
} }
else else
{ {
String previousName = getAdapter(previousResult).getAbsoluteName(previousResult); String previousName = getViewAdapter(previousResult).getAbsoluteName(previousResult);
if (previousName != null && previousName.equals(oldName)) if (previousName != null && previousName.equals(oldName))
{ {
@ -1165,7 +1165,7 @@ public class SystemTableView
remoteResourceName = (String) remoteResource; remoteResourceName = (String) remoteResource;
else else
{ {
IRemoteObjectIdentifier ra = getAdapter(remoteResource); IRemoteObjectIdentifier ra = getViewAdapter(remoteResource);
if (ra == null) if (ra == null)
return null; return null;
remoteResourceName = ra.getAbsoluteName(remoteResource); remoteResourceName = ra.getAbsoluteName(remoteResource);
@ -1181,7 +1181,7 @@ public class SystemTableView
return; return;
_selectionFlagsUpdated = false; _selectionFlagsUpdated = false;
ISystemViewElementAdapter adapter = getAdapter(firstSelection); ISystemViewElementAdapter adapter = getViewAdapter(firstSelection);
if (adapter != null) if (adapter != null)
{ {
displayMessage(adapter.getStatusLineText(firstSelection)); displayMessage(adapter.getStatusLineText(firstSelection));
@ -1422,7 +1422,7 @@ public class SystemTableView
{ {
element = elements.next(); element = elements.next();
//multiSource[idx++] = element; //multiSource[idx++] = element;
adapter = getAdapter(element); adapter = getViewAdapter(element);
ok = adapter.doDelete(getShell(), element, monitor); ok = adapter.doDelete(getShell(), element, monitor);
if (ok) if (ok)
{ {
@ -1511,10 +1511,10 @@ public class SystemTableView
while (ok && elements.hasNext()) while (ok && elements.hasNext())
{ {
element = elements.next(); element = elements.next();
adapter = getAdapter(element); adapter = getViewAdapter(element);
Object parentElement = getParentForContent(element); Object parentElement = getParentForContent(element);
remoteAdapter = getAdapter(element); remoteAdapter = getViewAdapter(element);
if (remoteAdapter != null) if (remoteAdapter != null)
oldFullName = remoteAdapter.getAbsoluteName(element); oldFullName = remoteAdapter.getAbsoluteName(element);
// pre-rename // pre-rename
@ -1665,7 +1665,7 @@ public class SystemTableView
while (elements.hasNext()) while (elements.hasNext())
{ {
Object element = elements.next(); Object element = elements.next();
ISystemViewElementAdapter adapter = getAdapter(element); ISystemViewElementAdapter adapter = getViewAdapter(element);
adapters.put(adapter, element); // want only unique adapters adapters.put(adapter, element); // want only unique adapters
} }
Enumeration uniqueAdapters = adapters.keys(); Enumeration uniqueAdapters = adapters.keys();
@ -1774,7 +1774,7 @@ public class SystemTableView
while (elements.hasNext()) while (elements.hasNext())
{ {
Object element = elements.next(); Object element = elements.next();
ISystemViewElementAdapter adapter = getAdapter(element); ISystemViewElementAdapter adapter = getViewAdapter(element);
if (_selectionShowRefreshAction) if (_selectionShowRefreshAction)
_selectionShowRefreshAction = adapter.showRefresh(element); _selectionShowRefreshAction = adapter.showRefresh(element);
@ -1812,7 +1812,7 @@ public class SystemTableView
Object data = item.getData(); Object data = item.getData();
if (data instanceof IAdaptable) if (data instanceof IAdaptable)
{ {
ISystemViewElementAdapter adapter = getAdapter(data); ISystemViewElementAdapter adapter = getViewAdapter(data);
String itemName = adapter.getName(data); String itemName = adapter.getName(data);
if (StringCompare.compare(name, itemName, false)) if (StringCompare.compare(name, itemName, false))