diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java index 6e9019c4b67..347417442fe 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java @@ -581,6 +581,11 @@ public class DStoreConnectorService extends AbstractConnectorService implements // this will be the temp remoteuser userid. //launchStatus = clientConnection.launchServer(getLocalUserId(), getPassword(getPasswordInformation())); SystemSignonInformation info = getPasswordInformation(); + if (info == null) + { + System.out.println("password info = null!"); + } + int daemonPort = 0; if (serverLauncher != null) daemonPort = serverLauncher.getDaemonPort(); diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/CombineForm.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/CombineForm.java index 5cb24412048..98e42677e48 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/CombineForm.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/CombineForm.java @@ -266,9 +266,9 @@ public class CombineForm extends SystemSelectRemoteFileOrFolderForm * object. Returns null if the adapter is not defined or the * object is not adaptable. */ - protected ISystemViewElementAdapter getAdapter(Object o) + protected ISystemViewElementAdapter getViewAdapter(Object o) { - return SystemAdapterHelpers.getAdapter(o); + return SystemAdapterHelpers.getViewAdapter(o); } /** diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/ExtractToForm.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/ExtractToForm.java index f643d73a2e8..f16d8ba1a0f 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/ExtractToForm.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/ExtractToForm.java @@ -153,9 +153,9 @@ public class ExtractToForm extends SystemSelectRemoteFileOrFolderForm * object. Returns null if the adapter is not defined or the * object is not adaptable. */ - protected ISystemViewElementAdapter getAdapter(Object o) + protected ISystemViewElementAdapter getViewAdapter(Object o) { - return SystemAdapterHelpers.getAdapter(o); + return SystemAdapterHelpers.getViewAdapter(o); } /** diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SaveAsForm.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SaveAsForm.java index 73b0fbe6f27..9bb2248aac7 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SaveAsForm.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SaveAsForm.java @@ -173,9 +173,9 @@ public class SaveAsForm extends SystemSelectRemoteFileOrFolderForm { * object. Returns null if the adapter is not defined or the * object is not adaptable. */ - protected ISystemViewElementAdapter getAdapter(Object o) + protected ISystemViewElementAdapter getViewAdapter(Object o) { - return SystemAdapterHelpers.getAdapter(o); + return SystemAdapterHelpers.getViewAdapter(o); } /** diff --git a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/dialogs/SystemKillDialog.java b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/dialogs/SystemKillDialog.java index ec1c85a729a..5796aa23587 100644 --- a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/dialogs/SystemKillDialog.java +++ b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/dialogs/SystemKillDialog.java @@ -317,9 +317,9 @@ public class SystemKillDialog extends SystemPromptDialog * object. Returns null if the adapter is not defined or the * object is not adaptable. */ - protected ISystemViewElementAdapter getAdapter(Object o) + protected ISystemViewElementAdapter getViewAdapter(Object o) { - return SystemAdapterHelpers.getAdapter(o); + return SystemAdapterHelpers.getViewAdapter(o); } public String getSignal() diff --git a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/dialogs/SystemKillTableRow.java b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/dialogs/SystemKillTableRow.java index 3290e8a78e8..1b99dd3e0e8 100644 --- a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/dialogs/SystemKillTableRow.java +++ b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/dialogs/SystemKillTableRow.java @@ -44,7 +44,7 @@ public class SystemKillTableRow extends SystemDeleteTableRow if (element instanceof SystemSimpleContentElement) element = ((SystemSimpleContentElement)element).getData(); this.element = element; - this.adapter = getAdapter(element); + this.adapter = getViewAdapter(element); this.remoteAdapter = getRemoteAdapter(element); this.rowNbr = rowNbr; if (adapter != null) @@ -104,7 +104,7 @@ public class SystemKillTableRow extends SystemDeleteTableRow /** * Get the input object adapter for the input object this row represents */ - public ISystemViewElementAdapter getAdapter() + public ISystemViewElementAdapter getViewAdapter() { return adapter; } @@ -128,9 +128,9 @@ public class SystemKillTableRow extends SystemDeleteTableRow * object. Returns null if the adapter is not defined or the * object is not adaptable. */ - protected ISystemViewElementAdapter getAdapter(Object o) + protected ISystemViewElementAdapter getViewAdapter(Object o) { - return SystemAdapterHelpers.getAdapter(o); + return SystemAdapterHelpers.getViewAdapter(o); } /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemAbstractAPIProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemAbstractAPIProvider.java index b902d6f0528..8c62352d0d7 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemAbstractAPIProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemAbstractAPIProvider.java @@ -202,9 +202,9 @@ public abstract class SystemAbstractAPIProvider * object. Returns null if the adapter is not defined or the * object is not adaptable. */ - protected ISystemViewElementAdapter getAdapter(Object o) + protected ISystemViewElementAdapter getViewAdapter(Object o) { - return SystemAdapterHelpers.getAdapter(o); + return SystemAdapterHelpers.getViewAdapter(o); } /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemResourceSelectionForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemResourceSelectionForm.java index 038f0861328..b861c5b78c2 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemResourceSelectionForm.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemResourceSelectionForm.java @@ -254,7 +254,7 @@ public class SystemResourceSelectionForm implements ISelectionChangedListener } } - protected ISystemViewElementAdapter getAdapter(Object selection) + protected ISystemViewElementAdapter getViewAdapter(Object selection) { if (selection != null && selection instanceof IAdaptable) { @@ -308,7 +308,7 @@ public class SystemResourceSelectionForm implements ISelectionChangedListener public boolean setPreSelection(Object selection) { - ISystemViewElementAdapter adapter = getAdapter(selection); + ISystemViewElementAdapter adapter = getViewAdapter(selection); if (adapter != null) { Object parent = adapter.getParent(selection); @@ -401,7 +401,7 @@ public class SystemResourceSelectionForm implements ISelectionChangedListener private void setPathTextFromSelection(Object selection) { - ISystemViewElementAdapter adapter = getAdapter(selection); + ISystemViewElementAdapter adapter = getViewAdapter(selection); String text = adapter.getAbsoluteName(selection); setPathText(text); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java index 2f21c39bb61..2b8c6b741e0 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java @@ -180,7 +180,7 @@ public class SystemSelectRemoteObjectAPIProviderImpl { this.subsystem = subsystem; if (subsystem != null) - this.subsystemAdapter = getAdapter(subsystem); + this.subsystemAdapter = getViewAdapter(subsystem); else this.subsystemAdapter = null; } @@ -603,9 +603,9 @@ public class SystemSelectRemoteObjectAPIProviderImpl * object. Returns null if the adapter is not defined or the * object is not adaptable. */ - protected ISystemViewElementAdapter getAdapter(Object o) + protected ISystemViewElementAdapter getViewAdapter(Object o) { - return SystemAdapterHelpers.getAdapter(o); + return SystemAdapterHelpers.getViewAdapter(o); } /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableTreeView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableTreeView.java index 89d7f1b1e74..7cb6c34dfea 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableTreeView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableTreeView.java @@ -144,7 +144,7 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec { public Object getValue(Object element, String property) { - ISystemViewElementAdapter adapter = getAdapter(element); + ISystemViewElementAdapter adapter = getViewAdapter(element); adapter.setPropertySourceInput(element); Object value = adapter.getPropertyValue(property); if (value == null) @@ -165,7 +165,7 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec if (element instanceof TableItem && value != null) { Object obj = ((TableItem) element).getData(); - ISystemViewElementAdapter adapter = getAdapter(obj); + ISystemViewElementAdapter adapter = getViewAdapter(obj); if (adapter != null) { adapter.setPropertyValue(property, value); @@ -421,9 +421,9 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec /** * Convenience method for retrieving the view adapter for an object */ - protected ISystemViewElementAdapter getAdapter(Object obj) + protected ISystemViewElementAdapter getViewAdapter(Object obj) { - return SystemAdapterHelpers.getAdapter(obj, this); + return SystemAdapterHelpers.getViewAdapter(obj, this); } public SystemTableViewColumnManager getColumnManager() @@ -456,7 +456,7 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec if (children != null && children.length > 0) { IAdaptable child = (IAdaptable) children[0]; - ISystemViewElementAdapter adapter = getAdapter(child); + ISystemViewElementAdapter adapter = getViewAdapter(child); adapter.setPropertySourceInput(child); return getCustomDescriptors(adapter); } @@ -478,7 +478,7 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec if (children != null && children.length > 0) { IAdaptable child = (IAdaptable) children[0]; - return getAdapter(child).getPropertyDescriptors()[0]; + return getViewAdapter(child).getPropertyDescriptors()[0]; } return null; @@ -951,7 +951,7 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec { Object dchild = remoteResource; - ISystemViewElementAdapter dadapt = getAdapter(dchild); + ISystemViewElementAdapter dadapt = getViewAdapter(dchild); if (dadapt != null) { ISubSystem dSubSystem = dadapt.getSubSystem(dchild); @@ -965,7 +965,7 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec Object existingChild = children[i]; if (existingChild != null) { - ISystemViewElementAdapter eadapt = getAdapter(existingChild); + ISystemViewElementAdapter eadapt = getViewAdapter(existingChild); ISubSystem eSubSystem = eadapt.getSubSystem(existingChild); if (dSubSystem == eSubSystem) @@ -1022,7 +1022,7 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec } else { - String previousName = getAdapter(previousResult).getAbsoluteName(previousResult); + String previousName = getViewAdapter(previousResult).getAbsoluteName(previousResult); if (previousName != null && previousName.equals(oldName)) { @@ -1070,7 +1070,7 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec return; _selectionFlagsUpdated = false; - ISystemViewElementAdapter adapter = getAdapter(firstSelection); + ISystemViewElementAdapter adapter = getViewAdapter(firstSelection); if (adapter != null) { displayMessage(adapter.getStatusLineText(firstSelection)); @@ -1107,7 +1107,7 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec /** * Convenience method for retrieving the view adapter for an object's children */ - public ISystemViewElementAdapter getAdapterForContents() + public ISystemViewElementAdapter getViewAdapterForContents() { SystemTableTreeViewProvider provider = (SystemTableTreeViewProvider) getContentProvider(); if (provider != null) @@ -1116,7 +1116,7 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec if (children != null && children.length > 0) { IAdaptable child = (IAdaptable) children[0]; - return getAdapter(child); + return getViewAdapter(child); } } return null; @@ -1291,7 +1291,7 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec { element = elements.next(); //multiSource[idx++] = element; - adapter = getAdapter(element); + adapter = getViewAdapter(element); ok = adapter.doDelete(getShell(), element, monitor); if (ok) { @@ -1381,7 +1381,7 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec while (ok && elements.hasNext()) { element = elements.next(); - adapter = getAdapter(element); + adapter = getViewAdapter(element); Object parentElement = getParentForContent(element); remoteAdapter = getRemoteAdapter(element); @@ -1573,7 +1573,7 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec while (elements.hasNext()) { Object element = elements.next(); - ISystemViewElementAdapter adapter = getAdapter(element); + ISystemViewElementAdapter adapter = getViewAdapter(element); adapters.put(adapter, element); // want only unique adapters } Enumeration uniqueAdapters = adapters.keys(); @@ -1792,7 +1792,7 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec while (elements.hasNext()) { Object element = elements.next(); - ISystemViewElementAdapter adapter = getAdapter(element); + ISystemViewElementAdapter adapter = getViewAdapter(element); if (_selectionShowRefreshAction) _selectionShowRefreshAction = adapter.showRefresh(element); @@ -1831,7 +1831,7 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec Object data = item.getData(); if (data instanceof IAdaptable) { - ISystemViewElementAdapter adapter = getAdapter(data); + ISystemViewElementAdapter adapter = getViewAdapter(data); String itemName = adapter.getName(data); if (StringCompare.compare(name, itemName, false)) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableTreeViewProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableTreeViewProvider.java index 3e4c2ede24d..82c37f1e121 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableTreeViewProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableTreeViewProvider.java @@ -167,11 +167,11 @@ public class SystemTableTreeViewProvider implements ILabelProvider, ITableLabelP ISystemViewElementAdapter result = null; if (_viewer != null) { - result = SystemAdapterHelpers.getAdapter(object, _viewer); + result = SystemAdapterHelpers.getViewAdapter(object, _viewer); } else { - result = SystemAdapterHelpers.getAdapter(object); + result = SystemAdapterHelpers.getViewAdapter(object); } if (result == null) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewProvider.java index 6989f6c432e..60d048bdc42 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewProvider.java @@ -129,11 +129,11 @@ public class SystemTableViewProvider implements ILabelProvider, ITableLabelProvi ISystemViewElementAdapter result = null; if (_viewer != null) { - result = SystemAdapterHelpers.getAdapter(object, _viewer); + result = SystemAdapterHelpers.getViewAdapter(object, _viewer); } else { - result = SystemAdapterHelpers.getAdapter(object); + result = SystemAdapterHelpers.getViewAdapter(object); } result.setPropertySourceInput(object); return result; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java index 90b22caaa98..9db0d82fcdf 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java @@ -1264,9 +1264,9 @@ public class SystemView extends SafeTreeViewer implements ISystemTree, ISystemRe // not updated when selecting a connection in the Remote Systems view. // This ensures that the input provider for the Remote Systems view is set for the adapter. if (provider != null) { - return SystemAdapterHelpers.getAdapter(o, this, provider); + return SystemAdapterHelpers.getViewAdapter(o, this, provider); } else { - return SystemAdapterHelpers.getAdapter(o, this); + return SystemAdapterHelpers.getViewAdapter(o, this); } } @@ -4234,7 +4234,7 @@ public class SystemView extends SafeTreeViewer implements ISystemTree, ISystemRe SystemRemoteElementResourceSet set = null; if (lastSet != null) { - if (lastSet.getAdapter() == adapter && lastSet.getSubSystem() == srcSubSystem) + if (lastSet.getViewAdapter() == adapter && lastSet.getSubSystem() == srcSubSystem) { set = lastSet; } @@ -4369,7 +4369,7 @@ public class SystemView extends SafeTreeViewer implements ISystemTree, ISystemRe for (int s = 0; s < _setList.size() && ok; s++) { set = (SystemRemoteElementResourceSet) _setList.get(s); ISubSystem srcSubSystem = set.getSubSystem(); - ISystemViewElementAdapter srcAdapter = set.getAdapter(); + ISystemViewElementAdapter srcAdapter = set.getViewAdapter(); if (srcSubSystem != null) { @@ -5165,7 +5165,7 @@ public class SystemView extends SafeTreeViewer implements ISystemTree, ISystemRe protected SystemRemoteElementResourceSet getSetFor(ISubSystem subSystem, ISystemViewElementAdapter adapter) { for (int i = 0; i < _setList.size(); i++) { SystemRemoteElementResourceSet set = (SystemRemoteElementResourceSet) _setList.get(i); - if (set.getAdapter() == adapter && set.getSubSystem() == subSystem) { + if (set.getViewAdapter() == adapter && set.getSubSystem() == subSystem) { return set; } } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForConnections.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForConnections.java index ebabf1601f1..3182d4eb197 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForConnections.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForConnections.java @@ -65,7 +65,7 @@ public class SystemViewAPIProviderForConnections public Object[] getSystemViewRoots() { //return sr.getSubSystems(connection); - return getAdapter(connection).getChildren(new NullProgressMonitor(), connection); // pc42690 + return getViewAdapter(connection).getChildren(new NullProgressMonitor(), connection); // pc42690 } /** * Return true if {@link #getSystemViewRoots()} will return a non-empty list @@ -84,7 +84,7 @@ public class SystemViewAPIProviderForConnections public Object[] getConnectionChildren(IHost selectedConnection) { //return sr.getSubSystems(selectedConnection); - return getAdapter(selectedConnection).getChildren(new NullProgressMonitor(), selectedConnection); // pc42690 + return getViewAdapter(selectedConnection).getChildren(new NullProgressMonitor(), selectedConnection); // pc42690 } /** * This method is called by the connection adapter when deciding to show a plus-sign diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewLabelAndContentProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewLabelAndContentProvider.java index a09d68dbc74..494a888e026 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewLabelAndContentProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewLabelAndContentProvider.java @@ -179,7 +179,7 @@ public class SystemViewLabelAndContentProvider extends LabelProvider * object. Returns null if the adapter is not defined or the * object is not adaptable. */ - protected ISystemViewElementAdapter getAdapter(Object o) + protected ISystemViewElementAdapter getViewAdapter(Object o) { if (o instanceof IContextObject) { @@ -260,7 +260,7 @@ public class SystemViewLabelAndContentProvider extends LabelProvider */ public Object[] getChildren(Object object) { - ISystemViewElementAdapter adapter = getAdapter(object); + ISystemViewElementAdapter adapter = getViewAdapter(object); Object element = object; if (object instanceof IContextObject) { @@ -369,7 +369,7 @@ public class SystemViewLabelAndContentProvider extends LabelProvider */ public Object getParent(Object element) { - ISystemViewElementAdapter adapter = getAdapter(element); + ISystemViewElementAdapter adapter = getViewAdapter(element); if (adapter != null) return adapter.getParent(element); return null; @@ -385,7 +385,7 @@ public class SystemViewLabelAndContentProvider extends LabelProvider */ public boolean hasChildren(Object element) { - ISystemViewElementAdapter adapter = getAdapter(element); + ISystemViewElementAdapter adapter = getViewAdapter(element); if (element instanceof IContextObject) { return adapter.hasChildren((IContextObject)element); @@ -438,7 +438,7 @@ public class SystemViewLabelAndContentProvider extends LabelProvider } public Image getImage(Object element) { - ISystemViewElementAdapter adapter = getAdapter(element); + ISystemViewElementAdapter adapter = getViewAdapter(element); //System.out.println("Inside getImage. element = " + element + ", adapter = " + adapter); if (adapter == null) return null; @@ -474,7 +474,7 @@ public class SystemViewLabelAndContentProvider extends LabelProvider */ public String getText(Object element) { - ISystemViewElementAdapter adapter = getAdapter(element); + ISystemViewElementAdapter adapter = getViewAdapter(element); //System.out.println("INSIDE GETTEXT FOR SVLandCprovider: " + element + ", adapter = " + adapter); if (adapter == null) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadView.java index 5e8fcb95bad..0382d9b81af 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadView.java @@ -267,9 +267,9 @@ public class SystemScratchpadView /** * Convenience method for retrieving the view adapter for an object */ - protected ISystemViewElementAdapter getAdapter(Object obj) + protected ISystemViewElementAdapter getViewAdapter(Object obj) { - return SystemAdapterHelpers.getAdapter(obj, this); + return SystemAdapterHelpers.getViewAdapter(obj, this); } @@ -581,7 +581,7 @@ public class SystemScratchpadView return; _selectionFlagsUpdated = false; - ISystemViewElementAdapter adapter = getAdapter(firstSelection); + ISystemViewElementAdapter adapter = getViewAdapter(firstSelection); if (adapter != null) { displayMessage(adapter.getStatusLineText(firstSelection)); @@ -839,7 +839,7 @@ public class SystemScratchpadView { element = elements.next(); //multiSource[idx++] = element; - adapter = getAdapter(element); + adapter = getViewAdapter(element); ok = adapter.doDelete(getShell(), element, monitor); if (ok) { @@ -929,7 +929,7 @@ public class SystemScratchpadView while (ok && elements.hasNext()) { element = elements.next(); - adapter = getAdapter(element); + adapter = getViewAdapter(element); Object parentElement = getParentForContent(element); remoteAdapter = getRemoteAdapter(element); @@ -1117,7 +1117,7 @@ public class SystemScratchpadView while (elements.hasNext()) { Object element = elements.next(); - ISystemViewElementAdapter adapter = getAdapter(element); + ISystemViewElementAdapter adapter = getViewAdapter(element); if (adapter != null) { adapters.put(adapter, element); // want only unique adapters @@ -1358,7 +1358,7 @@ public class SystemScratchpadView while (elements.hasNext()) { Object element = elements.next(); - ISystemViewElementAdapter adapter = getAdapter(element); + ISystemViewElementAdapter adapter = getViewAdapter(element); if (adapter != null) { if (_selectionShowRefreshAction) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchTableView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchTableView.java index 1e2b0e5ca31..e127db01f97 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchTableView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchTableView.java @@ -99,7 +99,7 @@ public class SystemSearchTableView extends SystemTableTreeView { Object dchild = remoteResourceNames.get(d); - ISystemViewElementAdapter dadapt = getAdapter(dchild); + ISystemViewElementAdapter dadapt = getViewAdapter(dchild); ISubSystem dSubSystem = dadapt.getSubSystem(dchild); String dkey = dadapt.getAbsoluteName(dchild); @@ -117,7 +117,7 @@ public class SystemSearchTableView extends SystemTableTreeView if (existingChild != null) { - ISystemViewElementAdapter eadapt = getAdapter(existingChild); + ISystemViewElementAdapter eadapt = getViewAdapter(existingChild); ISubSystem eSubSystem = eadapt.getSubSystem(existingChild); if (dSubSystem == eSubSystem) @@ -363,7 +363,7 @@ public class SystemSearchTableView extends SystemTableTreeView protected Object getParentForContent(Object element) { - return getAdapter(element).getParent(element); + return getViewAdapter(element).getParent(element); } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewContentProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewContentProvider.java index 49e7cc3e179..3db887ecad5 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewContentProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewContentProvider.java @@ -50,7 +50,7 @@ public class SystemSearchViewContentProvider implements ITreeContentProvider { } if (parentElement instanceof IAdaptable) { - ISystemViewElementAdapter adapter = getAdapter(parentElement); + ISystemViewElementAdapter adapter = getViewAdapter(parentElement); if (adapter == null) { return null; @@ -73,7 +73,7 @@ public class SystemSearchViewContentProvider implements ITreeContentProvider { } if (element instanceof IAdaptable) { - ISystemViewElementAdapter adapter = getAdapter(element); + ISystemViewElementAdapter adapter = getViewAdapter(element); if (adapter == null) { return null; @@ -96,7 +96,7 @@ public class SystemSearchViewContentProvider implements ITreeContentProvider { } if (element instanceof IAdaptable) { - ISystemViewElementAdapter adapter = getAdapter(element); + ISystemViewElementAdapter adapter = getViewAdapter(element); if (adapter == null) { return false; @@ -119,7 +119,7 @@ public class SystemSearchViewContentProvider implements ITreeContentProvider { } if (inputElement instanceof IAdaptable) { - ISystemViewElementAdapter adapter = getAdapter(inputElement); + ISystemViewElementAdapter adapter = getViewAdapter(inputElement); if (adapter == null) { return null; @@ -148,7 +148,7 @@ public class SystemSearchViewContentProvider implements ITreeContentProvider { } if (newInput instanceof IAdaptable) { - ISystemViewElementAdapter adapter = getAdapter(newInput); + ISystemViewElementAdapter adapter = getViewAdapter(newInput); if (adapter != null) { viewer.refresh(); @@ -161,9 +161,9 @@ public class SystemSearchViewContentProvider implements ITreeContentProvider { * @param the object * @return the adapter */ - public ISystemViewElementAdapter getAdapter(Object element) + public ISystemViewElementAdapter getViewAdapter(Object element) { - return SystemAdapterHelpers.getAdapter(element); + return SystemAdapterHelpers.getViewAdapter(element); } /** * Set the ViewPart of this provider diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewLabelProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewLabelProvider.java index 5e2977d2268..a2eef6c0731 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewLabelProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewLabelProvider.java @@ -48,7 +48,7 @@ public class SystemSearchViewLabelProvider extends LabelProvider { } if (element instanceof IAdaptable) { - ISystemViewElementAdapter adapter = getAdapter(element); + ISystemViewElementAdapter adapter = getViewAdapter(element); if (adapter != null) { ImageDescriptor descriptor = adapter.getImageDescriptor(element); @@ -72,7 +72,7 @@ public class SystemSearchViewLabelProvider extends LabelProvider { } if (element instanceof IAdaptable) { - ISystemViewElementAdapter adapter = getAdapter(element); + ISystemViewElementAdapter adapter = getViewAdapter(element); if (adapter != null) { return adapter.getText(element); @@ -87,8 +87,8 @@ public class SystemSearchViewLabelProvider extends LabelProvider { * @param the object * @return the adapter */ - public ISystemViewElementAdapter getAdapter(Object element) + public ISystemViewElementAdapter getViewAdapter(Object element) { - return SystemAdapterHelpers.getAdapter(element); + return SystemAdapterHelpers.getViewAdapter(element); } } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewPart.java index 7c914b69d72..fbba909e4b4 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewPart.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewPart.java @@ -127,7 +127,7 @@ public class SystemSearchViewPart extends ViewPart if (!selection.isEmpty()) { Object element = selection.getFirstElement(); - ISystemViewElementAdapter adapter = getAdapter(element); + ISystemViewElementAdapter adapter = getViewAdapter(element); adapter.setViewer(currentViewer); adapter.handleDoubleClick(element); } @@ -370,7 +370,7 @@ public class SystemSearchViewPart extends ViewPart return false; } - ISystemViewElementAdapter adapter = getAdapter(input); + ISystemViewElementAdapter adapter = getViewAdapter(input); if (adapter == null) { return false; @@ -408,7 +408,7 @@ public class SystemSearchViewPart extends ViewPart public void addSearchResult(IAdaptable resultSet) { // if the correct adapter is not registered, then return - ISystemViewElementAdapter adapter = getAdapter(resultSet); + ISystemViewElementAdapter adapter = getViewAdapter(resultSet); if (adapter == null) { return; @@ -607,7 +607,7 @@ public class SystemSearchViewPart extends ViewPart Object input = treeView.getInput(); - ISystemViewElementAdapter adapter = getAdapter(input); + ISystemViewElementAdapter adapter = getViewAdapter(input); if (adapter != null && adapter instanceof ISystemRemoveElementAdapter) { ISystemRemoveElementAdapter rmAdapter = (ISystemRemoveElementAdapter)adapter; @@ -650,7 +650,7 @@ public class SystemSearchViewPart extends ViewPart return; } - ISystemViewElementAdapter adapter = getAdapter(resultSet); + ISystemViewElementAdapter adapter = getViewAdapter(resultSet); // if the correct adapter is not registered, then return if (adapter == null) { @@ -703,7 +703,7 @@ public class SystemSearchViewPart extends ViewPart Object input = currentViewer.getInput(); - ISystemViewElementAdapter adapter = getAdapter(input); + ISystemViewElementAdapter adapter = getViewAdapter(input); // adapter should be an instance of ISystemRemoveElementAdapter if (adapter == null || !(adapter instanceof ISystemRemoveElementAdapter)) { @@ -827,7 +827,7 @@ public class SystemSearchViewPart extends ViewPart Object input = currentViewer.getInput(); - ISystemViewElementAdapter adapter = getAdapter(input); + ISystemViewElementAdapter adapter = getViewAdapter(input); // universal search if (currentViewer instanceof SystemSearchTableView) @@ -887,8 +887,8 @@ public class SystemSearchViewPart extends ViewPart * @param element the object the object for which I want the adapter. * @return the adapter for the object. */ - public ISystemViewElementAdapter getAdapter(Object element) { - return SystemAdapterHelpers.getAdapter(element); + public ISystemViewElementAdapter getViewAdapter(Object element) { + return SystemAdapterHelpers.getViewAdapter(element); } /** @@ -917,7 +917,7 @@ public class SystemSearchViewPart extends ViewPart IHostSearchResultSet source = ((IHostSearchResultConfiguration)actualSource).getParentResultSet(); // get title to use from adapter - ISystemViewElementAdapter adapter = getAdapter(source); + ISystemViewElementAdapter adapter = getViewAdapter(source); if (adapter == null) { return; @@ -1037,7 +1037,7 @@ public class SystemSearchViewPart extends ViewPart // adapter actions SystemMenuManager ourMenu = new SystemMenuManager(menu); Object element = selection.getFirstElement(); - ISystemViewElementAdapter adapter = getAdapter(element); + ISystemViewElementAdapter adapter = getViewAdapter(element); adapter.setViewer(currentViewer); adapter.addActions(ourMenu, selection, getShell(), @@ -1163,7 +1163,7 @@ public class SystemSearchViewPart extends ViewPart // set viewer for adapters of the selected elements while (iter.hasNext()) { - ISystemViewElementAdapter adapter = getAdapter(iter.next()); + ISystemViewElementAdapter adapter = getViewAdapter(iter.next()); adapter.setViewer(currentViewer); } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewPart.java index d393aa9fe1d..b55a842c6d8 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewPart.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewPart.java @@ -491,7 +491,7 @@ public class SystemTeamViewPart } else { - ISystemViewElementAdapter adapter = SystemAdapterHelpers.getAdapter(firstSelection, treeViewer); + ISystemViewElementAdapter adapter = SystemAdapterHelpers.getViewAdapter(firstSelection, treeViewer); if (adapter != null) { if ((firstSelection instanceof SystemTeamViewSubSystemConfigurationNode) || @@ -547,7 +547,7 @@ public class SystemTeamViewPart while (elements.hasNext()) { Object element= elements.next(); - ISystemViewElementAdapter adapter = SystemAdapterHelpers.getAdapter(element, treeViewer); + ISystemViewElementAdapter adapter = SystemAdapterHelpers.getViewAdapter(element, treeViewer); if (adapter != null) adapters.put(adapter,element); // want only unique adapters } @@ -1219,7 +1219,7 @@ public class SystemTeamViewPart */ protected String internalGetMementoHandleKey(Object o) { - ISystemViewElementAdapter adapter = SystemAdapterHelpers.getAdapter(o, treeViewer); + ISystemViewElementAdapter adapter = SystemAdapterHelpers.getViewAdapter(o, treeViewer); String handle = null; if (adapter != null) handle = adapter.getMementoHandleKey(o); @@ -1248,7 +1248,7 @@ public class SystemTeamViewPart */ protected String internalGetMementoHandle(Object o) { - ISystemViewElementAdapter adapter = SystemAdapterHelpers.getAdapter(o, treeViewer); + ISystemViewElementAdapter adapter = SystemAdapterHelpers.getViewAdapter(o, treeViewer); String handle = null; if (adapter != null) handle = adapter.getMementoHandle(o); @@ -1439,7 +1439,7 @@ public class SystemTeamViewPart Object firstSelection = sel.getFirstElement(); if (firstSelection == null) return; - ISystemViewElementAdapter adapter = SystemAdapterHelpers.getAdapter(firstSelection); + ISystemViewElementAdapter adapter = SystemAdapterHelpers.getViewAdapter(firstSelection); if (adapter != null) { setMessage(adapter.getStatusLineText(firstSelection)); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseAction.java index 3d3305aa796..c0ed6a92264 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseAction.java @@ -329,9 +329,9 @@ public class SystemBaseAction extends Action implements ISystemAction * object. Returns null if the adapter is not defined or the * object is not adaptable. */ - protected ISystemViewElementAdapter getAdapter(Object o) + protected ISystemViewElementAdapter getViewAdapter(Object o) { - return SystemAdapterHelpers.getAdapter(o); + return SystemAdapterHelpers.getViewAdapter(o); } /** * Returns the implementation of ISystemRemoteElement for the given diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCollapseAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCollapseAction.java index 578944128e8..d3f34664fd2 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCollapseAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCollapseAction.java @@ -61,7 +61,7 @@ public class SystemCollapseAction extends SystemBaseAction { ISystemViewElementAdapter adapter = null; while (!enable && e.hasNext()) { Object selectedObject = e.next(); - adapter = getAdapter(selectedObject); + adapter = getViewAdapter(selectedObject); if (adapter != null) { if (adapter.hasChildren((IAdaptable)selectedObject)) enable = true; } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemExpandAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemExpandAction.java index 976e1dbd391..00da2c01863 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemExpandAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemExpandAction.java @@ -64,7 +64,7 @@ public class SystemExpandAction extends SystemBaseAction { ISystemViewElementAdapter adapter = null; while (!enable && e.hasNext()) { Object selectedObject = e.next(); - adapter = getAdapter(selectedObject); + adapter = getViewAdapter(selectedObject); if (adapter != null) { if (adapter.hasChildren((IAdaptable)selectedObject)) enable = true; } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRefreshAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRefreshAction.java index 98f8db55fb9..606b88c21b3 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRefreshAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRefreshAction.java @@ -88,7 +88,7 @@ public class SystemRefreshAction extends SystemBaseAction } // get the adapter and find out if it's a leaf node. If so, refresh the parent as well. - ISystemViewElementAdapter adapter = getAdapter(obj); + ISystemViewElementAdapter adapter = getViewAdapter(obj); if (adapter != null) { Object parent = adapter.getParent(obj); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemDeleteDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemDeleteDialog.java index a2bebb35880..07c1dad2e9d 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemDeleteDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemDeleteDialog.java @@ -287,8 +287,8 @@ public class SystemDeleteDialog extends SystemPromptDialog * object. Returns null if the adapter is not defined or the * object is not adaptable. */ - protected ISystemViewElementAdapter getAdapter(Object o) + protected ISystemViewElementAdapter getViewAdapter(Object o) { - return SystemAdapterHelpers.getAdapter(o); + return SystemAdapterHelpers.getViewAdapter(o); } } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemDeleteTableRow.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemDeleteTableRow.java index cd57a7cbc10..1cf7cbaa490 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemDeleteTableRow.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemDeleteTableRow.java @@ -48,7 +48,7 @@ public class SystemDeleteTableRow if (element instanceof SystemSimpleContentElement) element = ((SystemSimpleContentElement)element).getData(); this.element = element; - this.adapter = getAdapter(element); + this.adapter = getViewAdapter(element); this.remoteAdapter = getRemoteAdapter(element); this.rowNbr = rowNbr; //this.oldName = getAdapter(element).getText(element); @@ -66,7 +66,7 @@ public class SystemDeleteTableRow if (typeElement instanceof ISystemFilterPoolReference) { typeElement = ((ISystemFilterPoolReference)typeElement).getReferencedFilterPool(); - typeAdapter = getAdapter(typeElement); + typeAdapter = getViewAdapter(typeElement); } if (typeAdapter != null) this.type = typeAdapter.getType(typeElement); @@ -138,7 +138,7 @@ public class SystemDeleteTableRow /** * Get the input object adapter for the input object this row represents */ - public ISystemViewElementAdapter getAdapter() + public ISystemViewElementAdapter getViewAdapter() { return adapter; } @@ -162,9 +162,9 @@ public class SystemDeleteTableRow * object. Returns null if the adapter is not defined or the * object is not adaptable. */ - protected ISystemViewElementAdapter getAdapter(Object o) + protected ISystemViewElementAdapter getViewAdapter(Object o) { - return SystemAdapterHelpers.getAdapter(o); + return SystemAdapterHelpers.getViewAdapter(o); } /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java index 2c703b0d391..0a48b7ba78a 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java @@ -324,7 +324,7 @@ public class SystemRenameSingleDialog extends SystemPromptDialog if (!initialized) { inputElement = getInputElement(inputObject); - adapter = getAdapter(inputElement); + adapter = getViewAdapter(inputElement); if (adapter != null) inputName = adapter.getName(inputElement); else if (inputElement instanceof ISystemTypedObject) @@ -363,7 +363,7 @@ public class SystemRenameSingleDialog extends SystemPromptDialog if (inputElement instanceof ISystemFilterPoolReference) { inputElement = ((ISystemFilterPoolReference)inputElement).getReferencedFilterPool(); - adapter = getAdapter(inputElement); + adapter = getViewAdapter(inputElement); } if (adapter != null) @@ -464,9 +464,9 @@ public class SystemRenameSingleDialog extends SystemPromptDialog * object. Returns null if the adapter is not defined or the * object is not adaptable. */ - protected ISystemViewElementAdapter getAdapter(Object o) + protected ISystemViewElementAdapter getViewAdapter(Object o) { - return SystemAdapterHelpers.getAdapter(o); + return SystemAdapterHelpers.getViewAdapter(o); } /** * Returns the implementation of ISystemRemoteElement for the given diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameTableRow.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameTableRow.java index f3459ff367a..0d2addacf78 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameTableRow.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameTableRow.java @@ -43,7 +43,7 @@ public class SystemRenameTableRow extends SystemDeleteTableRow { super(element,rowNbr); this.newName = getName(); - this.inputValidator = getAdapter(element).getNameValidator(element); + this.inputValidator = getViewAdapter(element).getNameValidator(element); if (inputValidator != null) { nameLengthLimit = inputValidator.getMaximumNameLength(); } @@ -114,7 +114,7 @@ public class SystemRenameTableRow extends SystemDeleteTableRow { // this is all for defect 42145 Object element = super.getElement(); - ISystemViewElementAdapter adapter = super.getAdapter(); + ISystemViewElementAdapter adapter = super.getViewAdapter(); String cName = newName; if (adapter != null) cName = adapter.getCanonicalNewName(element, newName); @@ -130,7 +130,7 @@ public class SystemRenameTableRow extends SystemDeleteTableRow public boolean newNameEqualsOldName() { Object element = super.getElement(); - ISystemViewElementAdapter adapter = super.getAdapter(); + ISystemViewElementAdapter adapter = super.getViewAdapter(); if (adapter != null) return adapter.namesAreEqual(element, newName); else diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemConnectionSubSystemsPropertyPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemConnectionSubSystemsPropertyPage.java index e89fd98f765..74befadf5ea 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemConnectionSubSystemsPropertyPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemConnectionSubSystemsPropertyPage.java @@ -346,9 +346,9 @@ public class SystemConnectionSubSystemsPropertyPage extends SystemBasePropertyPa * object. Returns null if the adapter is not defined or the * object is not adaptable. */ - protected ISystemViewElementAdapter getAdapter(Object o) + protected ISystemViewElementAdapter getViewAdapter(Object o) { - return SystemAdapterHelpers.getAdapter(o); + return SystemAdapterHelpers.getViewAdapter(o); } /** * Returns the implementation of ISystemRemoteElement for the given diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java index 410b2821420..3148bd46ca0 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java @@ -1525,7 +1525,7 @@ public abstract class AbstractSystemViewAdapter * object. Returns null if the adapter is not defined or the * object is not adaptable. *

- * Just a convenient shortcut to {@link org.eclipse.rse.core.SystemAdapterHelpers#getAdapter(Object, Viewer)} + * Just a convenient shortcut to {@link org.eclipse.rse.core.SystemAdapterHelpers#getViewAdapter(Object, Viewer)} *

* Should we allow clients to override this in order to provide an * optimized implementation for their models? But it's being called @@ -1535,7 +1535,7 @@ public abstract class AbstractSystemViewAdapter */ protected ISystemViewElementAdapter getSystemViewElementAdapter(Object o) { - return SystemAdapterHelpers.getAdapter(o, getViewer()); + return SystemAdapterHelpers.getViewAdapter(o, getViewer()); /* ISystemViewElementAdapter adapter = null; if (!(o instanceof IAdaptable)) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java index e5b7c412dcb..cf815fc82d2 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java @@ -429,7 +429,7 @@ public class SystemTableView */ protected ISystemViewElementAdapter getViewAdapter(Object obj) { - ISystemViewElementAdapter adapter = SystemAdapterHelpers.getAdapter(obj, this); + ISystemViewElementAdapter adapter = SystemAdapterHelpers.getViewAdapter(obj, this); if (adapter != null) adapter.setPropertySourceInput(obj); return adapter; diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemRemoteElementResourceSet.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemRemoteElementResourceSet.java index e154eee1b95..e796cd9c594 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemRemoteElementResourceSet.java +++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemRemoteElementResourceSet.java @@ -67,7 +67,7 @@ public class SystemRemoteElementResourceSet extends AbstractSystemResourceSet _subSystem = subSystem; } - public ISystemViewElementAdapter getAdapter() + public ISystemViewElementAdapter getViewAdapter() { return _adapter; } diff --git a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemAdapterHelpers.java b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemAdapterHelpers.java index 31bc410597b..970eaf7c1fb 100644 --- a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemAdapterHelpers.java +++ b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemAdapterHelpers.java @@ -11,7 +11,7 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * Uwe Stieber (Wind River) - [174418] SystemAdapterHelpers.getAdapter(Object) try to find adapter twice + * Uwe Stieber (Wind River) - [174418] SystemAdapterHelpers.getViewAdapter(Object) try to find adapter twice ********************************************************************************/ package org.eclipse.rse.core; @@ -36,7 +36,7 @@ public class SystemAdapterHelpers { * object. Returns null if the adapter is not defined or the * object is not adaptable. */ - public static ISystemViewElementAdapter getAdapter(Object o) { + public static ISystemViewElementAdapter getViewAdapter(Object o) { ISystemViewElementAdapter adapter = null; // In case the object itself is an adaptable, call the objects getAdapter() method @@ -55,8 +55,8 @@ public class SystemAdapterHelpers { * the adapter, but also sets its viewer to the given viewer. Many actions rely * on this being set. */ - public static ISystemViewElementAdapter getAdapter(Object o, Viewer viewer) { - ISystemViewElementAdapter adapter = getAdapter(o); + public static ISystemViewElementAdapter getViewAdapter(Object o, Viewer viewer) { + ISystemViewElementAdapter adapter = getViewAdapter(o); if (adapter != null) { //FIXME This is not thread-safe. adapter.setViewer(viewer); @@ -69,8 +69,8 @@ public class SystemAdapterHelpers { * the adapter, but also sets its viewer and input provider to the given viewer. * Many actions rely on this being set. */ - public static ISystemViewElementAdapter getAdapter(Object o, Viewer viewer, ISystemViewInputProvider inputProvider) { - ISystemViewElementAdapter adapter = getAdapter(o, viewer); + public static ISystemViewElementAdapter getViewAdapter(Object o, Viewer viewer, ISystemViewInputProvider inputProvider) { + ISystemViewElementAdapter adapter = getViewAdapter(o, viewer); if (adapter != null) { //FIXME This is not thread-safe.