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

[175150] getAdapter(Object) -> getViewAdapter(Object)

Browse source
This commit is contained in:
David McKnight 2007-03-02 16:31:01 +00:00
parent aa68c51811
commit eb56824abb
34 changed files with 128 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java
View file

@ -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();

4
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/CombineForm.java
View file

@ -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);
}
/**

4
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/ExtractToForm.java
View file

@ -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);
}
/**

4
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SaveAsForm.java
View file

@ -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);
}
/**

4
rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/dialogs/SystemKillDialog.java
View file

@ -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()

8
rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/dialogs/SystemKillTableRow.java
View file

@ -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);
}
/**

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemAbstractAPIProvider.java
View file

@ -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);
}
/**

6
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemResourceSelectionForm.java
View file

@ -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);

6
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java
View file

@ -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);
}
/**

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

@ -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))

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableTreeViewProvider.java
View file

@ -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)
{

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewProvider.java
View file

@ -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;

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

@ -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;
}
}

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForConnections.java
View file

@ -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

12
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewLabelAndContentProvider.java
View file

@ -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)
{

14
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadView.java
View file

@ -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)

6
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchTableView.java
View file

@ -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);
}

14
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewContentProvider.java
View file

@ -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

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

@ -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);
}
}

24
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewPart.java
View file

@ -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);
}

10
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewPart.java
View file

@ -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));

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseAction.java
View file

@ -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

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCollapseAction.java
View file

@ -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;
}

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemExpandAction.java
View file

@ -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;
}

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRefreshAction.java
View file

@ -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);

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemDeleteDialog.java
View file

@ -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);
}
}

10
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemDeleteTableRow.java
View file

@ -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);
}
/**

8
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java
View file

@ -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

6
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameTableRow.java
View file

@ -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

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemConnectionSubSystemsPropertyPage.java
View file

@ -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

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java
View file

@ -1525,7 +1525,7 @@ public abstract class AbstractSystemViewAdapter
* object. Returns null if the adapter is not defined or the
* object is not adaptable.
* <p/>
* 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)}
* <p/>
* 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))

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

@ -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;

2
rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemRemoteElementResourceSet.java
View file

@ -67,7 +67,7 @@ public class SystemRemoteElementResourceSet extends AbstractSystemResourceSet
_subSystem = subSystem;
}
public ISystemViewElementAdapter getAdapter()
public ISystemViewElementAdapter getViewAdapter()
{
return _adapter;
}

12
rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemAdapterHelpers.java
View file

@ -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.