Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 94875 Details for
Bug 225506
[api][breaking] RSE UI leaks non-API types
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
[patch]
patch with updates
patch.txt (text/plain), 124.55 KB, created by
David McKnight
on 2008-04-04 11:56:39 EDT
(
hide
)
Description:
patch with updates
Filename:
MIME Type:
Creator:
David McKnight
Created:
2008-04-04 11:56:39 EDT
Size:
124.55 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.rse.ui >Index: UI/org/eclipse/rse/ui/view/SystemTableView.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java,v >retrieving revision 1.44 >diff -u -r1.44 SystemTableView.java >--- UI/org/eclipse/rse/ui/view/SystemTableView.java 3 Apr 2008 16:03:34 -0000 1.44 >+++ UI/org/eclipse/rse/ui/view/SystemTableView.java 4 Apr 2008 15:55:38 -0000 >@@ -487,7 +487,7 @@ > return new IPropertyDescriptor[0]; > } > >- public SystemTableViewColumnManager getColumnManager() >+ public ISystemTableViewColumnManager getColumnManager() > { > return _columnManager; > } >@@ -1406,7 +1406,7 @@ > * Get the common "Open to->" action for opening a new Remote System Explorer view, > * scoped to the currently selected object. > */ >- protected SystemOpenExplorerPerspectiveAction getOpenToPerspectiveAction() >+ private SystemOpenExplorerPerspectiveAction getOpenToPerspectiveAction() > { > if (_openToPerspectiveAction == null) > { >@@ -1419,7 +1419,7 @@ > return _openToPerspectiveAction; > } > >- protected SystemShowInTableAction getShowInTableAction() >+ private SystemShowInTableAction getShowInTableAction() > { > if (_showInTableAction == null) > { >Index: UI/org/eclipse/rse/ui/view/ISystemTree.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/ISystemTree.java,v >retrieving revision 1.5 >diff -u -r1.5 ISystemTree.java >--- UI/org/eclipse/rse/ui/view/ISystemTree.java 3 Apr 2008 14:39:26 -0000 1.5 >+++ UI/org/eclipse/rse/ui/view/ISystemTree.java 4 Apr 2008 15:55:36 -0000 >@@ -19,6 +19,9 @@ > > import java.util.List; > >+import org.eclipse.jface.viewers.IDoubleClickListener; >+import org.eclipse.jface.viewers.ISelectionChangedListener; >+import org.eclipse.jface.viewers.ViewerFilter; > import org.eclipse.rse.core.filters.ISystemFilter; > import org.eclipse.rse.core.filters.ISystemFilterReference; > import org.eclipse.rse.core.subsystems.ISubSystem; >@@ -179,5 +182,56 @@ > */ > public List findAllRemoteItemReferences(Object element, Object elementObject, List matches); > >+ /** >+ * Sets the auto expand level for the corresponding tree >+ * @param level the level to expand >+ * @since 3.0 >+ */ >+ public void setAutoExpandLevel(int level); >+ >+ /** >+ * Adds a double-click listener >+ * @param listener the listener to add >+ * @since 3.0 >+ */ >+ public void addDoubleClickListener(IDoubleClickListener listener); >+ >+ /** >+ * Checks whether the element is expandable or not >+ * @param elementOrTreePath the object to expand >+ * @return whether the item is expandable >+ * @since 3.0 >+ */ >+ public boolean isExpandable(Object elementOrTreePath); >+ >+ /** >+ * Expands the parent object down to the remote object >+ * @param parentObject the parent object >+ * @param remoteObject the child object >+ * @since 3.0 >+ */ >+ public void expandTo(Object parentObject, Object remoteObject); >+ >+ /** >+ * Expand to the object specified by the filter string >+ * @param filterString the string represending the object to expand to >+ * @since 3.0 >+ */ >+ public void expandTo(String filterString); >+ >+ /** >+ * Adds a view filter >+ * @param filter the view filter >+ * @since 3.0 >+ */ >+ public void addFilter(ViewerFilter filter); > >+ >+ /** >+ * Adds a selection changed listener >+ * @param listener the listener >+ * @since 3.0 >+ */ >+ public void addSelectionChangedListener(ISelectionChangedListener listener); >+ > } >Index: UI/org/eclipse/rse/ui/view/SystemTableViewProvider.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewProvider.java,v >retrieving revision 1.7 >diff -u -r1.7 SystemTableViewProvider.java >--- UI/org/eclipse/rse/ui/view/SystemTableViewProvider.java 3 Apr 2008 16:03:34 -0000 1.7 >+++ UI/org/eclipse/rse/ui/view/SystemTableViewProvider.java 4 Apr 2008 15:55:38 -0000 >@@ -38,7 +38,6 @@ > import org.eclipse.rse.core.filters.ISystemFilterReference; > import org.eclipse.rse.core.model.ISystemContainer; > import org.eclipse.rse.core.subsystems.ISubSystem; >-import org.eclipse.rse.internal.ui.view.SystemTableViewColumnManager; > import org.eclipse.rse.internal.ui.view.SystemViewPromptableAdapter; > import org.eclipse.rse.internal.ui.view.SystemViewRootInputAdapter; > import org.eclipse.swt.graphics.Image; >@@ -69,14 +68,14 @@ > * Maps ImageDescriptor->Image. > */ > private Map imageTable = new Hashtable(40); >- private SystemTableViewColumnManager _columnManager; >+ private ISystemTableViewColumnManager _columnManager; > private HashMap cache; > /** > * Constructor for table view provider where a column manager is present. > * In this case, the columns are customizable by the user. > * @param columnManager > */ >- public SystemTableViewProvider(SystemTableViewColumnManager columnManager) >+ public SystemTableViewProvider(ISystemTableViewColumnManager columnManager) > { > super(); > _columnManager= columnManager; >Index: UI/org/eclipse/rse/ui/filters/actions/SystemFilterAbstractFilterPoolAction.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterAbstractFilterPoolAction.java,v >retrieving revision 1.8 >diff -u -r1.8 SystemFilterAbstractFilterPoolAction.java >--- UI/org/eclipse/rse/ui/filters/actions/SystemFilterAbstractFilterPoolAction.java 5 Jun 2007 11:36:57 -0000 1.8 >+++ UI/org/eclipse/rse/ui/filters/actions/SystemFilterAbstractFilterPoolAction.java 4 Apr 2008 15:55:36 -0000 >@@ -30,10 +30,10 @@ > import org.eclipse.rse.core.filters.ISystemFilterReference; > import org.eclipse.rse.core.filters.ISystemFilterString; > import org.eclipse.rse.core.filters.ISystemFilterStringReference; >-import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogInputs; >-import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogInterface; > import org.eclipse.rse.ui.actions.SystemBaseDialogAction; > import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement; >+import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInputs; >+import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInterface; > import org.eclipse.swt.widgets.Shell; > > >@@ -466,6 +466,7 @@ > /** > * Where you create the dialog meeting our interface. If you override > * createDialog, then override this to return null >+ * @since 3.0 > */ > public abstract SystemFilterPoolDialogInterface createFilterPoolDialog(Shell parent); > >Index: UI/org/eclipse/rse/ui/filters/actions/SystemFilterAbstractFilterPoolWizardAction.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterAbstractFilterPoolWizardAction.java,v >retrieving revision 1.4 >diff -u -r1.4 SystemFilterAbstractFilterPoolWizardAction.java >--- UI/org/eclipse/rse/ui/filters/actions/SystemFilterAbstractFilterPoolWizardAction.java 5 Jun 2007 11:36:57 -0000 1.4 >+++ UI/org/eclipse/rse/ui/filters/actions/SystemFilterAbstractFilterPoolWizardAction.java 4 Apr 2008 15:55:36 -0000 >@@ -20,10 +20,10 @@ > > import org.eclipse.jface.dialogs.Dialog; > import org.eclipse.jface.resource.ImageDescriptor; >-import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogInterface; > import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterPoolWizardDialog; >-import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterPoolWizardInterface; > import org.eclipse.rse.ui.ISystemContextMenuConstants; >+import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInterface; >+import org.eclipse.rse.ui.filters.dialogs.SystemFilterPoolWizardInterface; > import org.eclipse.swt.widgets.Shell; > > >@@ -82,6 +82,7 @@ > > /** > * Return the wizard so we can customize it prior to showing it. >+ * @since 3.0 > */ > public abstract SystemFilterPoolWizardInterface getFilterPoolWizard(); > >Index: UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilters.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilters.java,v >retrieving revision 1.12 >diff -u -r1.12 SystemViewAPIProviderForFilters.java >--- UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilters.java 21 Feb 2008 15:28:55 -0000 1.12 >+++ UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilters.java 4 Apr 2008 15:55:32 -0000 >@@ -41,6 +41,7 @@ > import org.eclipse.rse.ui.RSEUIPlugin; > import org.eclipse.rse.ui.SystemBasePlugin; > import org.eclipse.rse.ui.subsystems.ISubSystemConfigurationAdapter; >+import org.eclipse.rse.ui.view.SystemAbstractAPIProvider; > > > >Index: UI/org/eclipse/rse/internal/ui/view/SystemTestFilterStringAPIProviderImpl.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTestFilterStringAPIProviderImpl.java,v >retrieving revision 1.6 >diff -u -r1.6 SystemTestFilterStringAPIProviderImpl.java >--- UI/org/eclipse/rse/internal/ui/view/SystemTestFilterStringAPIProviderImpl.java 5 Jun 2007 20:59:59 -0000 1.6 >+++ UI/org/eclipse/rse/internal/ui/view/SystemTestFilterStringAPIProviderImpl.java 4 Apr 2008 15:55:32 -0000 >@@ -22,6 +22,7 @@ > import org.eclipse.rse.core.model.ISystemViewInputProvider; > import org.eclipse.rse.core.subsystems.ISubSystem; > import org.eclipse.rse.ui.SystemBasePlugin; >+import org.eclipse.rse.ui.view.SystemAbstractAPIProvider; > > > /** >Index: UI/org/eclipse/rse/internal/ui/view/SystemViewForm.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewForm.java,v >retrieving revision 1.10 >diff -u -r1.10 SystemViewForm.java >--- UI/org/eclipse/rse/internal/ui/view/SystemViewForm.java 12 Feb 2008 23:06:31 -0000 1.10 >+++ UI/org/eclipse/rse/internal/ui/view/SystemViewForm.java 4 Apr 2008 15:55:33 -0000 >@@ -21,6 +21,7 @@ > import java.util.Vector; > > import org.eclipse.jface.action.ToolBarManager; >+import org.eclipse.jface.viewers.IDoubleClickListener; > import org.eclipse.jface.viewers.ISelection; > import org.eclipse.jface.viewers.ISelectionChangedListener; > import org.eclipse.jface.viewers.ViewerFilter; >@@ -149,7 +150,7 @@ > /** > * Return the system view tree viewer > */ >- public SystemView getSystemView() >+ public ISystemTree getSystemTree() > { > return tree; > } >@@ -515,4 +516,26 @@ > ISystemFilter filter) { > return tree.revealAndExpand(parentSubSystem, filter); > } >+ public void addDoubleClickListener(IDoubleClickListener listener) { >+ tree.addDoubleClickListener(listener); >+ } >+ public void addFilter(ViewerFilter filter) { >+ tree.addFilter(filter); >+ >+ } >+ public void expandTo(Object parentObject, Object remoteObject) { >+ tree.expandTo(parentObject, remoteObject); >+ >+ } >+ public void expandTo(String filterString) { >+ tree.expandTo(filterString); >+ >+ } >+ public boolean isExpandable(Object elementOrTreePath) { >+ return tree.isExpandable(elementOrTreePath); >+ } >+ public void setAutoExpandLevel(int level) { >+ tree.setAutoExpandLevel(level); >+ } >+ > } >Index: UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilterStrings.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilterStrings.java,v >retrieving revision 1.6 >diff -u -r1.6 SystemViewAPIProviderForFilterStrings.java >--- UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilterStrings.java 14 Mar 2008 18:23:33 -0000 1.6 >+++ UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilterStrings.java 4 Apr 2008 15:55:32 -0000 >@@ -30,6 +30,7 @@ > import org.eclipse.rse.core.subsystems.ISubSystem; > import org.eclipse.rse.ui.ISystemMessages; > import org.eclipse.rse.ui.RSEUIPlugin; >+import org.eclipse.rse.ui.view.SystemAbstractAPIProvider; > > > /** >Index: UI/org/eclipse/rse/internal/ui/view/SystemViewAdapterFactory.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAdapterFactory.java,v >retrieving revision 1.6 >diff -u -r1.6 SystemViewAdapterFactory.java >--- UI/org/eclipse/rse/internal/ui/view/SystemViewAdapterFactory.java 28 Mar 2008 19:44:13 -0000 1.6 >+++ UI/org/eclipse/rse/internal/ui/view/SystemViewAdapterFactory.java 4 Apr 2008 15:55:33 -0000 >@@ -164,16 +164,5 @@ > return adapter; > } > >- /** >- * Because we use singletons for our adapters, it is possible to speed up >- * access to them by simply returning them from here. >- * <p> >- * This method returns the RSE adapter for profile objects >- * @return SystemViewProfileAdapter >- * >- * @deprecated Call getAdapter(...) directly with a <code>ISystemProfile</code>. instance as adaptable object. >- */ >- public SystemTeamViewProfileAdapter getProfileAdapter() { >- return profileAdapter; >- } >+ > } >\ No newline at end of file >Index: UI/org/eclipse/rse/internal/ui/view/SystemEmptyListAPIProviderImpl.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemEmptyListAPIProviderImpl.java,v >retrieving revision 1.4 >diff -u -r1.4 SystemEmptyListAPIProviderImpl.java >--- UI/org/eclipse/rse/internal/ui/view/SystemEmptyListAPIProviderImpl.java 5 Jun 2007 20:59:59 -0000 1.4 >+++ UI/org/eclipse/rse/internal/ui/view/SystemEmptyListAPIProviderImpl.java 4 Apr 2008 15:55:30 -0000 >@@ -18,6 +18,7 @@ > package org.eclipse.rse.internal.ui.view; > import org.eclipse.rse.core.model.IHost; > import org.eclipse.rse.core.model.ISystemViewInputProvider; >+import org.eclipse.rse.ui.view.SystemAbstractAPIProvider; > > > /** >Index: UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java,v >retrieving revision 1.29 >diff -u -r1.29 SystemTableViewPart.java >--- UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java 4 Apr 2008 14:08:06 -0000 1.29 >+++ UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java 4 Apr 2008 15:55:32 -0000 >@@ -96,6 +96,7 @@ > import org.eclipse.rse.ui.messages.ISystemMessageLine; > import org.eclipse.rse.ui.model.ISystemShellProvider; > import org.eclipse.rse.ui.view.IRSEViewPart; >+import org.eclipse.rse.ui.view.ISystemTableViewColumnManager; > import org.eclipse.rse.ui.view.ISystemViewElementAdapter; > import org.eclipse.rse.ui.view.SystemTableView; > import org.eclipse.rse.ui.view.SystemTableViewProvider; >@@ -807,7 +808,7 @@ > class SelectColumnsDialog extends SystemPromptDialog > { > private ISystemViewElementAdapter _adapter; >- private SystemTableViewColumnManager _columnManager; >+ private ISystemTableViewColumnManager _columnManager; > private IPropertyDescriptor[] _uniqueDescriptors; > private ArrayList _currentDisplayedDescriptors; > private ArrayList _availableDescriptors; >@@ -821,7 +822,7 @@ > private Button _downButton; > > >- public SelectColumnsDialog(Shell shell, ISystemViewElementAdapter viewAdapter, SystemTableViewColumnManager columnManager) >+ public SelectColumnsDialog(Shell shell, ISystemViewElementAdapter viewAdapter, ISystemTableViewColumnManager columnManager) > { > super(shell, SystemResources.RESID_TABLE_SELECT_COLUMNS_LABEL); > setToolTipText(SystemResources.RESID_TABLE_SELECT_COLUMNS_TOOLTIP); >@@ -1093,7 +1094,7 @@ > } > public void run() > { >- SystemTableViewColumnManager mgr = _viewer.getColumnManager(); >+ ISystemTableViewColumnManager mgr = _viewer.getColumnManager(); > ISystemViewElementAdapter adapter = _viewer.getAdapterForContents(); > SelectColumnsDialog dlg = new SelectColumnsDialog(getShell(), adapter, mgr); > if (dlg.open() == Window.OK) >@@ -1672,11 +1673,11 @@ > > boolean referToSameObject = false; > if (registry instanceof SystemRegistry) >- { >- String[] oldNames = event.getOldNames(); >- String oldName = (oldNames == null)? null : oldNames[0]; >- referToSameObject =((SystemRegistry)registry).isSameObjectByAbsoluteName(input, null, child,oldName); // right now assuming only one resource >- } >+ { >+ String[] oldNames = event.getOldNames(); >+ String oldName = (oldNames == null)? null : oldNames[0]; >+ referToSameObject = ((SystemRegistry)registry).isSameObjectByAbsoluteName(input, null, child, oldName); // right now assuming only one resource >+ } > > if (input == child || child instanceof java.util.List || referToSameObject) > { >Index: UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForSubSystems.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForSubSystems.java,v >retrieving revision 1.3 >diff -u -r1.3 SystemViewAPIProviderForSubSystems.java >--- UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForSubSystems.java 5 Jun 2007 11:36:52 -0000 1.3 >+++ UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForSubSystems.java 4 Apr 2008 15:55:32 -0000 >@@ -18,6 +18,7 @@ > package org.eclipse.rse.internal.ui.view; > import org.eclipse.rse.core.model.IHost; > import org.eclipse.rse.core.subsystems.ISubSystem; >+import org.eclipse.rse.ui.view.SystemAbstractAPIProvider; > > > /** >Index: UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilterPools.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilterPools.java,v >retrieving revision 1.3 >diff -u -r1.3 SystemViewAPIProviderForFilterPools.java >--- UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilterPools.java 5 Jun 2007 11:36:52 -0000 1.3 >+++ UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilterPools.java 4 Apr 2008 15:55:32 -0000 >@@ -20,6 +20,7 @@ > import org.eclipse.rse.core.filters.ISystemFilterPoolReference; > import org.eclipse.rse.core.model.IHost; > import org.eclipse.rse.core.subsystems.ISubSystem; >+import org.eclipse.rse.ui.view.SystemAbstractAPIProvider; > > > /** >Index: UI/org/eclipse/rse/internal/ui/view/SystemResourceSelectionInputProvider.java >=================================================================== >RCS file: UI/org/eclipse/rse/internal/ui/view/SystemResourceSelectionInputProvider.java >diff -N UI/org/eclipse/rse/internal/ui/view/SystemResourceSelectionInputProvider.java >--- UI/org/eclipse/rse/internal/ui/view/SystemResourceSelectionInputProvider.java 11 Sep 2007 16:30:31 -0000 1.5 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,142 +0,0 @@ >-/******************************************************************************** >- * Copyright (c) 2004, 2007 IBM Corporation and others. All rights reserved. >- * This program and the accompanying materials are made available under the terms >- * of the Eclipse Public License v1.0 which accompanies this distribution, and is >- * available at http://www.eclipse.org/legal/epl-v10.html >- * >- * Initial Contributors: >- * The following IBM employees contributed to the Remote System Explorer >- * component that contains this file: David McKnight, Kushal Munir, >- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, >- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. >- * >- * Contributors: >- * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType >- * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry >- * Martin Oberhuber (Wind River) - [202866] Fix exceptions in RSE browse dialog when SystemRegistry is not yet fully initialized >- ********************************************************************************/ >- >-package org.eclipse.rse.internal.ui.view; >-import org.eclipse.rse.core.IRSESystemType; >-import org.eclipse.rse.core.RSECorePlugin; >-import org.eclipse.rse.core.model.IHost; >-import org.eclipse.rse.core.model.ISystemRegistry; >-import org.eclipse.rse.core.subsystems.ISubSystem; >- >- >-public abstract class SystemResourceSelectionInputProvider extends SystemAbstractAPIProvider >-{ >- private IHost _connection = null; >- private boolean _onlyConnection = false; >- private boolean _allowNew = true; >- private IRSESystemType[] _systemTypes; >- private String _category = null; >- >- public SystemResourceSelectionInputProvider(IHost connection) >- { >- _connection = connection; >- } >- >- public SystemResourceSelectionInputProvider() >- { >- // choose random host >- ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); >- IHost[] hosts = registry.getHosts(); >- if (hosts != null && hosts.length>0) { >- _connection = hosts[0]; >- } >- } >- >- public IHost getSystemConnection() >- { >- return _connection; >- } >- >- public boolean allowMultipleConnections() >- { >- return !_onlyConnection; >- } >- >- public void setAllowNewConnection(boolean flag) >- { >- _allowNew = flag; >- } >- >- public boolean allowNewConnection() >- { >- return _allowNew; >- } >- >- public void setSystemConnection(IHost connection, boolean onlyConnection) >- { >- _connection = connection; >- _onlyConnection = onlyConnection; >- } >- >- public IRSESystemType[] getSystemTypes() >- { >- return _systemTypes; >- } >- >- public void setSystemTypes(IRSESystemType[] types) >- { >- _systemTypes = types; >- } >- >- public Object[] getSystemViewRoots() >- { >- if (_connection == null) >- { >- ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); >- IHost[] hosts = registry.getHosts(); >- if (hosts!=null && hosts.length!=0) { >- _connection = registry.getHosts()[0]; >- } >- } >- return getConnectionChildren(_connection); >- } >- >- public boolean hasSystemViewRoots() >- { >- return false; >- } >- >- public Object[] getConnectionChildren(IHost selectedConnection) >- { >- if (selectedConnection != null) >- { >- ISubSystem ss = getSubSystem(selectedConnection); >- if (ss!=null) { >- return ss.getChildren(); >- } >- } >- return new Object[0]; >- } >- >- public boolean hasConnectionChildren(IHost selectedConnection) >- { >- if (selectedConnection != null) >- { >- ISubSystem ss = getSubSystem(selectedConnection); >- if (ss!=null) { >- return ss.hasChildren(); >- } >- } >- return false; >- } >- >- protected abstract ISubSystem getSubSystem(IHost selectedConnection); >- >- >- public void setCategory(String category) >- { >- _category = category; >- } >- >- public String getCategory() >- { >- return _category; >- } >- >- >-} >\ No newline at end of file >Index: UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForConnections.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForConnections.java,v >retrieving revision 1.4 >diff -u -r1.4 SystemViewAPIProviderForConnections.java >--- UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForConnections.java 30 May 2007 18:09:25 -0000 1.4 >+++ UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForConnections.java 4 Apr 2008 15:55:32 -0000 >@@ -17,6 +17,7 @@ > package org.eclipse.rse.internal.ui.view; > import org.eclipse.core.runtime.NullProgressMonitor; > import org.eclipse.rse.core.model.IHost; >+import org.eclipse.rse.ui.view.SystemAbstractAPIProvider; > > /** > * This class is a provider of root nodes to the remote systems tree viewer part. >Index: UI/org/eclipse/rse/internal/ui/view/SystemResourceSelectionForm.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemResourceSelectionForm.java,v >retrieving revision 1.10 >diff -u -r1.10 SystemResourceSelectionForm.java >--- UI/org/eclipse/rse/internal/ui/view/SystemResourceSelectionForm.java 11 Sep 2007 16:30:31 -0000 1.10 >+++ UI/org/eclipse/rse/internal/ui/view/SystemResourceSelectionForm.java 4 Apr 2008 15:55:31 -0000 >@@ -43,8 +43,10 @@ > import org.eclipse.rse.ui.messages.ISystemMessageLine; > import org.eclipse.rse.ui.validators.IValidatorRemoteSelection; > import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; >+import org.eclipse.rse.ui.view.ISystemTree; > import org.eclipse.rse.ui.view.ISystemViewElementAdapter; > import org.eclipse.rse.ui.view.SystemAdapterHelpers; >+import org.eclipse.rse.ui.view.SystemResourceSelectionInputProvider; > import org.eclipse.rse.ui.widgets.SystemHostCombo; > import org.eclipse.swt.SWT; > import org.eclipse.swt.events.SelectionAdapter; >@@ -69,7 +71,7 @@ > private SystemHostCombo _connectionCombo; > private SystemViewForm _systemViewForm; > private Composite _propertySheetContainer; >- protected SystemPropertySheetForm _ps; >+ private SystemPropertySheetForm _ps; > > private Text _pathText; > private boolean _isValid; >@@ -139,9 +141,9 @@ > * Return the embedded System Tree object. > * Will be null until createControls is called. > */ >- public SystemViewForm getSystemViewForm() >+ public ISystemTree getSystemTree() > { >- return _systemViewForm; >+ return _systemViewForm.getSystemTree(); > } > > public void createControls(Composite parent) >@@ -243,7 +245,7 @@ > { > if (filter != null) > { >- _systemViewForm.getSystemView().addFilter(filter); >+ _systemViewForm.getSystemTree().addFilter(filter); > } > } > >@@ -340,11 +342,11 @@ > } > List filterRefs = registry.findFilterReferencesFor(selection, ss, false); > >- SystemView systemView = _systemViewForm.getSystemView(); >+ ISystemTree systemTree = _systemViewForm.getSystemTree(); > if (filterRefs.size() > 0) > { > ISystemFilterReference ref = (ISystemFilterReference)filterRefs.get(0); >- systemView.expandTo(ref, selection); >+ systemTree.expandTo(ref, selection); > > return true; > } >@@ -352,7 +354,7 @@ > { > if (setPreSelection(parent)) > { >- systemView.expandTo(parent, selection); >+ systemTree.expandTo(parent, selection); > return true; > } > } >Index: UI/org/eclipse/rse/internal/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java,v >retrieving revision 1.13 >diff -u -r1.13 SystemSelectRemoteObjectAPIProviderImpl.java >--- UI/org/eclipse/rse/internal/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java 3 Apr 2008 20:57:40 -0000 1.13 >+++ UI/org/eclipse/rse/internal/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java 4 Apr 2008 15:55:31 -0000 >@@ -29,14 +29,15 @@ > import org.eclipse.rse.core.filters.ISystemFilterStringReference; > import org.eclipse.rse.core.filters.SystemFilterUtil; > import org.eclipse.rse.core.model.IHost; >-import org.eclipse.rse.core.model.ISystemViewInputProvider; > import org.eclipse.rse.core.subsystems.ISubSystem; > import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; > import org.eclipse.rse.ui.SystemBasePlugin; > import org.eclipse.rse.ui.internal.model.SystemNewConnectionPromptObject; > import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; >+import org.eclipse.rse.ui.view.ISystemSelectRemoteObjectAPIProvider; > import org.eclipse.rse.ui.view.ISystemSelectRemoteObjectAPIProviderCaller; > import org.eclipse.rse.ui.view.ISystemViewElementAdapter; >+import org.eclipse.rse.ui.view.SystemAbstractAPIProvider; > import org.eclipse.rse.ui.view.SystemAdapterHelpers; > import org.eclipse.swt.widgets.Shell; > >@@ -53,8 +54,8 @@ > */ > public class SystemSelectRemoteObjectAPIProviderImpl > extends SystemAbstractAPIProvider >- implements ISystemViewInputProvider >-{ >+ implements ISystemSelectRemoteObjectAPIProvider >+ { > > > protected ISubSystem subsystem = null; >Index: UI/org/eclipse/rse/internal/ui/view/SystemTableViewColumnManager.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewColumnManager.java,v >retrieving revision 1.3 >diff -u -r1.3 SystemTableViewColumnManager.java >--- UI/org/eclipse/rse/internal/ui/view/SystemTableViewColumnManager.java 3 Apr 2008 16:03:35 -0000 1.3 >+++ UI/org/eclipse/rse/internal/ui/view/SystemTableViewColumnManager.java 4 Apr 2008 15:55:31 -0000 >@@ -20,11 +20,12 @@ > > import org.eclipse.jface.viewers.Viewer; > import org.eclipse.rse.ui.SystemPreferencesManager; >+import org.eclipse.rse.ui.view.ISystemTableViewColumnManager; > import org.eclipse.rse.ui.view.ISystemViewElementAdapter; > import org.eclipse.ui.views.properties.IPropertyDescriptor; > > >-public class SystemTableViewColumnManager >+public class SystemTableViewColumnManager implements ISystemTableViewColumnManager > { > private Viewer _viewer; > protected HashMap _descriptorCache; >Index: UI/org/eclipse/rse/internal/ui/view/SystemViewDataDropAdapter.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewDataDropAdapter.java,v >retrieving revision 1.4 >diff -u -r1.4 SystemViewDataDropAdapter.java >--- UI/org/eclipse/rse/internal/ui/view/SystemViewDataDropAdapter.java 20 Aug 2007 14:16:48 -0000 1.4 >+++ UI/org/eclipse/rse/internal/ui/view/SystemViewDataDropAdapter.java 4 Apr 2008 15:55:33 -0000 >@@ -114,7 +114,7 @@ > for (int i = 0;i < tokens.length; i++) > { > String srcStr = tokens[i]; >- if (srcStr.equals("org.eclipse.ui.navigator.ProjectExplorer")) >+ if (srcStr.equals("org.eclipse.ui.navigator.ProjectExplorer")) //$NON-NLS-1$ > { > return true; > } >Index: UI/org/eclipse/rse/internal/ui/view/SystemAbstractAPIProvider.java >=================================================================== >RCS file: UI/org/eclipse/rse/internal/ui/view/SystemAbstractAPIProvider.java >diff -N UI/org/eclipse/rse/internal/ui/view/SystemAbstractAPIProvider.java >--- UI/org/eclipse/rse/internal/ui/view/SystemAbstractAPIProvider.java 21 Feb 2008 15:28:55 -0000 1.9 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,213 +0,0 @@ >-/******************************************************************************** >- * Copyright (c) 2002, 2008 IBM Corporation and others. All rights reserved. >- * This program and the accompanying materials are made available under the terms >- * of the Eclipse Public License v1.0 which accompanies this distribution, and is >- * available at http://www.eclipse.org/legal/epl-v10.html >- * >- * Initial Contributors: >- * The following IBM employees contributed to the Remote System Explorer >- * component that contains this file: David McKnight, Kushal Munir, >- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, >- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. >- * >- * Contributors: >- * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry >- * Tobias Schwarz (Wind River) - [173267] "empty list" should not be displayed >- * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core >- * Martin Oberhuber (Wind River) - [218524][api] Remove deprecated ISystemViewInputProvider#getShell() >- ********************************************************************************/ >- >-package org.eclipse.rse.internal.ui.view; >-import org.eclipse.core.runtime.Platform; >-import org.eclipse.core.runtime.Preferences; >-import org.eclipse.jface.viewers.Viewer; >-import org.eclipse.rse.core.RSECorePlugin; >-import org.eclipse.rse.core.model.ISystemMessageObject; >-import org.eclipse.rse.core.model.ISystemRegistry; >-import org.eclipse.rse.core.model.ISystemViewInputProvider; >-import org.eclipse.rse.core.model.SystemMessageObject; >-import org.eclipse.rse.ui.ISystemMessages; >-import org.eclipse.rse.ui.ISystemPreferencesConstants; >-import org.eclipse.rse.ui.RSEUIPlugin; >-import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; >-import org.eclipse.rse.ui.view.ISystemViewElementAdapter; >-import org.eclipse.rse.ui.view.SystemAdapterHelpers; >-import org.eclipse.swt.widgets.Shell; >- >- >- >-/** >- * This is a base class that a provider of root nodes to the remote systems tree viewer part can >- * use as a parent class. >- */ >-public abstract class SystemAbstractAPIProvider >- implements ISystemViewInputProvider >-{ >- protected Viewer viewer; >- protected ISystemRegistry sr; >- >- protected Object[] emptyList = new Object[0]; >- protected Object[] msgList = new Object[1]; >- /** >- * @deprecated Use {@link #checkForEmptyList(Object[], Object, boolean)} instead. >- */ >- protected SystemMessageObject nullObject = null; >- protected SystemMessageObject canceledObject = null; >- protected SystemMessageObject errorObject = null; >- >- private Preferences fPrefStore = null; >- >- /** >- * Constructor >- */ >- public SystemAbstractAPIProvider() >- { >- super(); >- sr = RSECorePlugin.getTheSystemRegistry(); >- } >- >- /** >- * This is the method required by the IAdaptable interface. >- * Given an adapter class type, return an object castable to the type, or >- * null if this is not possible. >- */ >- public Object getAdapter(Class adapterType) >- { >- return Platform.getAdapterManager().getAdapter(this, adapterType); >- } >- >- /* >- * (non-Javadoc) >- * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#setViewer(java.lang.Object) >- */ >- public void setViewer(Object viewer) >- { >- this.viewer = (Viewer)viewer; >- } >- >- /* >- * (non-Javadoc) >- * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#getViewer() >- */ >- public Object getViewer() >- { >- return viewer; >- } >- >- protected final void initMsgObjects() >- { >- nullObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_EMPTY),ISystemMessageObject.MSGTYPE_EMPTY, null); >- canceledObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_LIST_CANCELED),ISystemMessageObject.MSGTYPE_CANCEL, null); >- errorObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_FAILED),ISystemMessageObject.MSGTYPE_ERROR, null); >- } >- >- /** >- * <i>Callable by subclasses. Do not override</i><br> >- * In getChildren, return <samp>checkForEmptyList(children, parent, true/false)<.samp> >- * versus your array directly. This method checks for a null array which is >- * not allowed and replaces it with an empty array. >- * If true is passed then it returns the "Empty list" message object if the array is null or empty >- * >- * @param children The list of children. >- * @param parent The parent for the children. >- * @param returnNullMsg <code>true</code> if an "Empty List" message should be returned. >- * @return The list of children, a list with the "Empty List" message object or an empty list. >- */ >- protected Object[] checkForEmptyList(Object[] children, Object parent, boolean returnNullMsg) { >- if ((children == null) || (children.length == 0)) { >- if (fPrefStore == null) { >- fPrefStore = RSEUIPlugin.getDefault().getPluginPreferences(); >- } >- if (!returnNullMsg >- || (fPrefStore != null && !fPrefStore >- .getBoolean(ISystemPreferencesConstants.SHOW_EMPTY_LISTS))) { >- return emptyList; >- } else { >- return new Object[] { >- new SystemMessageObject( >- RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_EMPTY), >- ISystemMessageObject.MSGTYPE_EMPTY, >- parent)}; >- } >- } >- return children; >- } >- >- /** >- * In getChildren, return checkForNull(children, true/false) vs your array directly. >- * This method checks for a null array which not allow and replaces it with an empty array. >- * If true is passed then it returns the "Empty list" message object if the array is null or empty >- * >- * @deprecated Use {@link #checkForEmptyList(Object[], Object, boolean)} instead. >- */ >- protected Object[] checkForNull(Object[] children, boolean returnNullMsg) >- { >- if ((children == null) || (children.length==0)) >- { >- if (!returnNullMsg) >- return emptyList; >- else >- { >- if (nullObject == null) >- initMsgObjects(); >- msgList[0] = nullObject; >- return msgList; >- } >- } >- else >- return children; >- } >- >- /** >- * Return the "Operation cancelled by user" msg as an object array so can be used to answer getChildren() >- */ >- protected Object[] getCancelledMessageObject() >- { >- if (canceledObject == null) >- initMsgObjects(); >- msgList[0] = canceledObject; >- return msgList; >- } >- >- /** >- * Return the "Operation failed" msg as an object array so can be used to answer getChildren() >- */ >- protected Object[] getFailedMessageObject() >- { >- if (errorObject == null) >- initMsgObjects(); >- msgList[0] = errorObject; >- return msgList; >- } >- >- /** >- * Return true if we are listing connections or not, so we know whether we are interested in >- * connection-add events >- */ >- public boolean showingConnections() >- { >- return false; >- } >- >- // ------------------ >- // HELPER METHODS... >- // ------------------ >- /** >- * Returns the implementation of ISystemViewElement for the given >- * object. Returns null if the adapter is not defined or the >- * object is not adaptable. >- */ >- protected ISystemViewElementAdapter getViewAdapter(Object o) >- { >- return SystemAdapterHelpers.getViewAdapter(o); >- } >- >- /** >- * Returns the implementation of ISystemRemoteElement for the given >- * object. Returns null if this object does not adaptable to this. >- */ >- protected ISystemRemoteElementAdapter getRemoteAdapter(Object o) >- { >- return SystemAdapterHelpers.getRemoteAdapter(o); >- } >-} >\ No newline at end of file >Index: UI/org/eclipse/rse/internal/ui/filters/SystemFilterPoolDialogOutputs.java >=================================================================== >RCS file: UI/org/eclipse/rse/internal/ui/filters/SystemFilterPoolDialogOutputs.java >diff -N UI/org/eclipse/rse/internal/ui/filters/SystemFilterPoolDialogOutputs.java >--- UI/org/eclipse/rse/internal/ui/filters/SystemFilterPoolDialogOutputs.java 5 Jun 2007 11:36:53 -0000 1.2 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,37 +0,0 @@ >-/******************************************************************************* >- * Copyright (c) 2002, 2007 IBM Corporation and others. >- * All rights reserved. This program and the accompanying materials >- * are made available under the terms of the Eclipse Public License v1.0 >- * which accompanies this distribution, and is available at >- * http://www.eclipse.org/legal/epl-v10.html >- * >- * Initial Contributors: >- * The following IBM employees contributed to the Remote System Explorer >- * component that contains this file: David McKnight, Kushal Munir, >- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, >- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. >- * >- * Contributors: >- * {Name} (company) - description of contribution. >- *******************************************************************************/ >- >-package org.eclipse.rse.internal.ui.filters; >-//import org.eclipse.rse.core.*; >-import org.eclipse.rse.core.filters.ISystemFilterPool; >-import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement; >- >- >- >-/** >- * A class capturing the attributes commonly returned by dialogs that >- * work with filter pools. >- */ >-public class SystemFilterPoolDialogOutputs >-{ >- >- >- public String filterPoolName; >- public String filterPoolManagerName; >- public SystemSimpleContentElement filterPoolTreeRoot; >- public ISystemFilterPool newPool; >-} >Index: UI/org/eclipse/rse/internal/ui/filters/SystemFilterPoolDialogInterface.java >=================================================================== >RCS file: UI/org/eclipse/rse/internal/ui/filters/SystemFilterPoolDialogInterface.java >diff -N UI/org/eclipse/rse/internal/ui/filters/SystemFilterPoolDialogInterface.java >--- UI/org/eclipse/rse/internal/ui/filters/SystemFilterPoolDialogInterface.java 5 Jun 2007 11:36:53 -0000 1.3 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,41 +0,0 @@ >-/******************************************************************************* >- * Copyright (c) 2002, 2007 IBM Corporation and others. >- * All rights reserved. This program and the accompanying materials >- * are made available under the terms of the Eclipse Public License v1.0 >- * which accompanies this distribution, and is available at >- * http://www.eclipse.org/legal/epl-v10.html >- * >- * Initial Contributors: >- * The following IBM employees contributed to the Remote System Explorer >- * component that contains this file: David McKnight, Kushal Munir, >- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, >- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. >- * >- * Contributors: >- * {Name} (company) - description of contribution. >- *******************************************************************************/ >- >-package org.eclipse.rse.internal.ui.filters; >-import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction; >- >- >-/** >- * Common interface for dialogs or wizards that work with filter pools. >- */ >-public interface SystemFilterPoolDialogInterface >-{ >- >- >- /** >- * Allow base action to pass instance of itself for callback to get info >- */ >- public void setFilterPoolDialogActionCaller(SystemFilterAbstractFilterPoolAction caller); >- /** >- * Return an object containing user-specified information pertinent to filter pool actions >- */ >- public SystemFilterPoolDialogOutputs getFilterPoolDialogOutputs(); >- /** >- * Set the help context id for this wizard >- */ >- public void setHelpContextId(String id); >-} >Index: UI/org/eclipse/rse/internal/ui/filters/SystemFilterPoolDialogInputs.java >=================================================================== >RCS file: UI/org/eclipse/rse/internal/ui/filters/SystemFilterPoolDialogInputs.java >diff -N UI/org/eclipse/rse/internal/ui/filters/SystemFilterPoolDialogInputs.java >--- UI/org/eclipse/rse/internal/ui/filters/SystemFilterPoolDialogInputs.java 5 Jun 2007 11:36:53 -0000 1.3 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,46 +0,0 @@ >-/******************************************************************************* >- * Copyright (c) 2002, 2007 IBM Corporation and others. >- * All rights reserved. This program and the accompanying materials >- * are made available under the terms of the Eclipse Public License v1.0 >- * which accompanies this distribution, and is available at >- * http://www.eclipse.org/legal/epl-v10.html >- * >- * Initial Contributors: >- * The following IBM employees contributed to the Remote System Explorer >- * component that contains this file: David McKnight, Kushal Munir, >- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, >- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. >- * >- * Contributors: >- * {Name} (company) - description of contribution. >- *******************************************************************************/ >- >-package org.eclipse.rse.internal.ui.filters; >-//import org.eclipse.rse.core.*; >-import org.eclipse.rse.core.filters.ISystemFilterPoolManager; >-import org.eclipse.rse.core.filters.ISystemFilterPoolManagerProvider; >-import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager; >-import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement; >-import org.eclipse.rse.ui.filters.dialogs.SystemFilterDialogInputs; >- >- >- >-/** >- * A class capturing the attributes commonly needed by dialogs that >- * work with filter pools. >- */ >-public class SystemFilterPoolDialogInputs extends SystemFilterDialogInputs >-{ >- >- >- public ISystemFilterPoolManagerProvider poolManagerProvider = null; >- public ISystemFilterPoolManager[] poolManagers = null; >- public ISystemFilterPoolReferenceManager refManager = null; >- public int mgrSelection = 0; >- public String poolNamePrompt; >- public String poolNameTip; >- public String poolMgrNamePrompt; >- public String poolMgrNameTip; >- >- public SystemSimpleContentElement filterPoolTreeRoot; >-} >Index: UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizardDefaultMainPage.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizardDefaultMainPage.java,v >retrieving revision 1.5 >diff -u -r1.5 SystemFilterNewFilterPoolWizardDefaultMainPage.java >--- UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizardDefaultMainPage.java 14 Mar 2008 18:23:32 -0000 1.5 >+++ UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizardDefaultMainPage.java 4 Apr 2008 15:55:30 -0000 >@@ -19,9 +19,9 @@ > import org.eclipse.jface.wizard.Wizard; > import org.eclipse.rse.core.filters.ISystemFilterPoolManager; > import org.eclipse.rse.internal.ui.SystemResources; >-import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogOutputs; > import org.eclipse.rse.services.clientserver.messages.SystemMessage; > import org.eclipse.rse.ui.SystemWidgetHelpers; >+import org.eclipse.rse.ui.filters.SystemFilterPoolDialogOutputs; > import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction; > import org.eclipse.rse.ui.validators.ISystemValidator; > import org.eclipse.rse.ui.validators.ValidatorFilterPoolName; >Index: UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizardMainPageInterface.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizardMainPageInterface.java,v >retrieving revision 1.2 >diff -u -r1.2 SystemFilterNewFilterPoolWizardMainPageInterface.java >--- UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizardMainPageInterface.java 5 Jun 2007 11:36:53 -0000 1.2 >+++ UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizardMainPageInterface.java 4 Apr 2008 15:55:30 -0000 >@@ -18,7 +18,7 @@ > package org.eclipse.rse.internal.ui.filters.dialogs; > > import org.eclipse.rse.core.filters.ISystemFilterPoolManager; >-import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogOutputs; >+import org.eclipse.rse.ui.filters.SystemFilterPoolDialogOutputs; > import org.eclipse.rse.ui.validators.ISystemValidator; > import org.eclipse.rse.ui.wizards.ISystemWizardPage; > >Index: UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterWorkWithFilterPoolsDialog.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterWorkWithFilterPoolsDialog.java,v >retrieving revision 1.8 >diff -u -r1.8 SystemFilterWorkWithFilterPoolsDialog.java >--- UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterWorkWithFilterPoolsDialog.java 12 Feb 2008 23:06:32 -0000 1.8 >+++ UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterWorkWithFilterPoolsDialog.java 4 Apr 2008 15:55:30 -0000 >@@ -43,8 +43,6 @@ > import org.eclipse.rse.internal.ui.actions.SystemFilterMoveFilterPoolAction; > import org.eclipse.rse.internal.ui.actions.SystemFilterNewFilterPoolAction; > import org.eclipse.rse.internal.ui.actions.SystemFilterWorkWithFilterPoolsRefreshAllAction; >-import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogInterface; >-import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogOutputs; > import org.eclipse.rse.internal.ui.filters.SystemFilterPoolManagerUIProvider; > import org.eclipse.rse.internal.ui.filters.SystemFilterWorkWithFilterPoolsTreeViewer; > import org.eclipse.rse.services.clientserver.messages.SystemMessage; >@@ -58,6 +56,8 @@ > import org.eclipse.rse.ui.dialogs.SystemPromptDialog; > import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement; > import org.eclipse.rse.ui.dialogs.SystemSimpleContentProvider; >+import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInterface; >+import org.eclipse.rse.ui.filters.SystemFilterPoolDialogOutputs; > import org.eclipse.rse.ui.filters.SystemFilterUIHelpers; > import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction; > import org.eclipse.rse.ui.messages.ISystemMessageLine; >Index: UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizard.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizard.java,v >retrieving revision 1.3 >diff -u -r1.3 SystemFilterNewFilterPoolWizard.java >--- UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizard.java 5 Jun 2007 11:36:53 -0000 1.3 >+++ UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizard.java 4 Apr 2008 15:55:29 -0000 >@@ -21,12 +21,13 @@ > import org.eclipse.rse.core.filters.ISystemFilterPool; > import org.eclipse.rse.core.filters.ISystemFilterPoolManager; > import org.eclipse.rse.internal.ui.SystemResources; >-import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogOutputs; > import org.eclipse.rse.services.clientserver.messages.SystemMessage; > import org.eclipse.rse.ui.ISystemIconConstants; > import org.eclipse.rse.ui.ISystemMessages; > import org.eclipse.rse.ui.RSEUIPlugin; >+import org.eclipse.rse.ui.filters.SystemFilterPoolDialogOutputs; > import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction; >+import org.eclipse.rse.ui.filters.dialogs.SystemFilterPoolWizardInterface; > import org.eclipse.rse.ui.messages.SystemMessageDialog; > import org.eclipse.rse.ui.validators.ValidatorFolderName; > import org.eclipse.rse.ui.wizards.AbstractSystemWizard; >Index: UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterPoolWizardDialog.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterPoolWizardDialog.java,v >retrieving revision 1.3 >diff -u -r1.3 SystemFilterPoolWizardDialog.java >--- UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterPoolWizardDialog.java 5 Jun 2007 11:36:53 -0000 1.3 >+++ UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterPoolWizardDialog.java 4 Apr 2008 15:55:30 -0000 >@@ -16,10 +16,11 @@ > *******************************************************************************/ > > package org.eclipse.rse.internal.ui.filters.dialogs; >-import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogInterface; >-import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogOutputs; > import org.eclipse.rse.ui.dialogs.SystemWizardDialog; >+import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInterface; >+import org.eclipse.rse.ui.filters.SystemFilterPoolDialogOutputs; > import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction; >+import org.eclipse.rse.ui.filters.dialogs.SystemFilterPoolWizardInterface; > import org.eclipse.swt.widgets.Shell; > > >Index: UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterPoolWizardInterface.java >=================================================================== >RCS file: UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterPoolWizardInterface.java >diff -N UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterPoolWizardInterface.java >--- UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterPoolWizardInterface.java 5 Jun 2007 11:36:53 -0000 1.2 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,28 +0,0 @@ >-/******************************************************************************* >- * Copyright (c) 2002, 2007 IBM Corporation and others. >- * All rights reserved. This program and the accompanying materials >- * are made available under the terms of the Eclipse Public License v1.0 >- * which accompanies this distribution, and is available at >- * http://www.eclipse.org/legal/epl-v10.html >- * >- * Initial Contributors: >- * The following IBM employees contributed to the Remote System Explorer >- * component that contains this file: David McKnight, Kushal Munir, >- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, >- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. >- * >- * Contributors: >- * {Name} (company) - description of contribution. >- *******************************************************************************/ >- >-package org.eclipse.rse.internal.ui.filters.dialogs; >-import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogInterface; >-import org.eclipse.rse.ui.wizards.ISystemWizard; >- >-/** >- * An interface for filter pool wizards to implement >- */ >-public interface SystemFilterPoolWizardInterface >- extends ISystemWizard, SystemFilterPoolDialogInterface >-{ >-} >Index: UI/org/eclipse/rse/internal/ui/dialogs/SystemTestFilterStringDialog.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemTestFilterStringDialog.java,v >retrieving revision 1.3 >diff -u -r1.3 SystemTestFilterStringDialog.java >--- UI/org/eclipse/rse/internal/ui/dialogs/SystemTestFilterStringDialog.java 25 May 2007 15:48:30 -0000 1.3 >+++ UI/org/eclipse/rse/internal/ui/dialogs/SystemTestFilterStringDialog.java 4 Apr 2008 15:55:29 -0000 >@@ -51,7 +51,7 @@ > */ > public class SystemTestFilterStringDialog > extends SystemPromptDialog >- implements ISelectionChangedListener, SelectionListener >+ implements ISelectionChangedListener, SelectionListener > { > protected ISubSystem subsystem = null; > protected ISystemRegistry sr = null; >Index: UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewPart.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewPart.java,v >retrieving revision 1.17 >diff -u -r1.17 SystemTeamViewPart.java >--- UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewPart.java 3 Apr 2008 17:18:10 -0000 1.17 >+++ UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewPart.java 4 Apr 2008 15:55:34 -0000 >@@ -715,6 +715,7 @@ > */ > private SystemTeamViewProfileAdapter getProfileAdapter(ISystemProfile profile) { > RSEUIPlugin plugin = RSEUIPlugin.getDefault(); >+ > IAdapterFactory factory = plugin.getSystemViewAdapterFactory(); > SystemTeamViewProfileAdapter adapter = (SystemTeamViewProfileAdapter) factory.getAdapter(profile, SystemTeamViewProfileAdapter.class); > return adapter; >Index: UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewPropertySetAdapter.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewPropertySetAdapter.java,v >retrieving revision 1.1 >diff -u -r1.1 SystemTeamViewPropertySetAdapter.java >--- UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewPropertySetAdapter.java 28 Mar 2008 19:44:13 -0000 1.1 >+++ UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewPropertySetAdapter.java 4 Apr 2008 15:55:34 -0000 >@@ -242,7 +242,7 @@ > public String getMementoHandleKey(Object element) > { > SystemTeamViewPropertySetNode factory = (SystemTeamViewPropertySetNode)element; >- return factory.getLabel(); //$NON-NLS-1$ >+ return factory.getLabel(); > } > > /** >Index: UI/org/eclipse/rse/internal/ui/actions/SystemFilterWorkWithFilterPoolsAction.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterWorkWithFilterPoolsAction.java,v >retrieving revision 1.6 >diff -u -r1.6 SystemFilterWorkWithFilterPoolsAction.java >--- UI/org/eclipse/rse/internal/ui/actions/SystemFilterWorkWithFilterPoolsAction.java 12 Feb 2008 23:06:32 -0000 1.6 >+++ UI/org/eclipse/rse/internal/ui/actions/SystemFilterWorkWithFilterPoolsAction.java 4 Apr 2008 15:55:29 -0000 >@@ -21,13 +21,13 @@ > import org.eclipse.rse.core.filters.ISystemFilterPoolManager; > import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManagerProvider; > import org.eclipse.rse.internal.ui.SystemResources; >-import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogInterface; > import org.eclipse.rse.internal.ui.filters.SystemFilterPoolManagerUIProvider; > import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterWorkWithFilterPoolsDialog; > import org.eclipse.rse.ui.ISystemContextMenuConstants; > import org.eclipse.rse.ui.ISystemIconConstants; > import org.eclipse.rse.ui.RSEUIPlugin; > import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement; >+import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInterface; > import org.eclipse.rse.ui.filters.SystemFilterUIHelpers; > import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction; > import org.eclipse.rse.ui.validators.ValidatorFilterPoolName; >Index: UI/org/eclipse/rse/internal/ui/actions/SystemResolveFilterStringAction.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemResolveFilterStringAction.java,v >retrieving revision 1.3 >diff -u -r1.3 SystemResolveFilterStringAction.java >--- UI/org/eclipse/rse/internal/ui/actions/SystemResolveFilterStringAction.java 5 Jun 2007 11:36:52 -0000 1.3 >+++ UI/org/eclipse/rse/internal/ui/actions/SystemResolveFilterStringAction.java 4 Apr 2008 15:55:29 -0000 >@@ -19,7 +19,6 @@ > import org.eclipse.jface.dialogs.Dialog; > import org.eclipse.rse.core.subsystems.ISubSystem; > import org.eclipse.rse.internal.ui.dialogs.SystemResolveFilterStringDialog; >-import org.eclipse.rse.ui.actions.SystemTestFilterStringAction; > import org.eclipse.swt.widgets.Shell; > > >@@ -61,9 +60,7 @@ > */ > protected Dialog createDialog(Shell shell) > { >- dlg = new SystemResolveFilterStringDialog(shell, subsystem, filterString); >- >- return dlg; >+ return new SystemResolveFilterStringDialog(shell, subsystem, filterString); > } // end createDialog() > > /** >Index: UI/org/eclipse/rse/internal/ui/actions/SystemFilterNewFilterPoolAction.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterNewFilterPoolAction.java,v >retrieving revision 1.4 >diff -u -r1.4 SystemFilterNewFilterPoolAction.java >--- UI/org/eclipse/rse/internal/ui/actions/SystemFilterNewFilterPoolAction.java 5 Jun 2007 11:36:52 -0000 1.4 >+++ UI/org/eclipse/rse/internal/ui/actions/SystemFilterNewFilterPoolAction.java 4 Apr 2008 15:55:29 -0000 >@@ -22,17 +22,17 @@ > import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager; > import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManagerProvider; > import org.eclipse.rse.internal.ui.SystemResources; >-import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogOutputs; > import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterNewFilterPoolWizard; > import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterPoolWizardDialog; >-import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterPoolWizardInterface; > import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterWorkWithFilterPoolsDialog; > import org.eclipse.rse.ui.ISystemContextMenuConstants; > import org.eclipse.rse.ui.ISystemIconConstants; > import org.eclipse.rse.ui.RSEUIPlugin; > import org.eclipse.rse.ui.actions.ISystemWizardAction; > import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement; >+import org.eclipse.rse.ui.filters.SystemFilterPoolDialogOutputs; > import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolWizardAction; >+import org.eclipse.rse.ui.filters.dialogs.SystemFilterPoolWizardInterface; > import org.eclipse.swt.widgets.Shell; > > >Index: UI/org/eclipse/rse/internal/ui/actions/SystemFilterSelectFilterPoolsAction.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterSelectFilterPoolsAction.java,v >retrieving revision 1.4 >diff -u -r1.4 SystemFilterSelectFilterPoolsAction.java >--- UI/org/eclipse/rse/internal/ui/actions/SystemFilterSelectFilterPoolsAction.java 5 Jun 2007 11:36:52 -0000 1.4 >+++ UI/org/eclipse/rse/internal/ui/actions/SystemFilterSelectFilterPoolsAction.java 4 Apr 2008 15:55:29 -0000 >@@ -24,12 +24,12 @@ > import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager; > import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManagerProvider; > import org.eclipse.rse.internal.ui.SystemResources; >-import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogInterface; > import org.eclipse.rse.ui.ISystemContextMenuConstants; > import org.eclipse.rse.ui.ISystemIconConstants; > import org.eclipse.rse.ui.RSEUIPlugin; > import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement; > import org.eclipse.rse.ui.dialogs.SystemSimpleSelectDialog; >+import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInterface; > import org.eclipse.rse.ui.filters.SystemFilterUIHelpers; > import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction; > import org.eclipse.swt.widgets.Shell; >Index: subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java,v >retrieving revision 1.72 >diff -u -r1.72 SubSystemConfiguration.java >--- subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java 19 Mar 2008 15:54:13 -0000 1.72 >+++ subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java 4 Apr 2008 15:55:39 -0000 >@@ -58,6 +58,7 @@ > import org.eclipse.rse.core.filters.ISystemFilterPoolManager; > import org.eclipse.rse.core.filters.ISystemFilterPoolReference; > import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager; >+import org.eclipse.rse.core.filters.ISystemFilterPoolWrapperInformation; > import org.eclipse.rse.core.filters.ISystemFilterString; > import org.eclipse.rse.core.model.IHost; > import org.eclipse.rse.core.model.ILabeledObject; >@@ -1414,7 +1415,7 @@ > * Overridable entry for child classes to supply their own flavour of ISystemFilterPoolWrapperInformation for > * the new filter wizards. > */ >- protected SystemFilterPoolWrapperInformation getNewFilterWizardPoolWrapperInformation() >+ protected ISystemFilterPoolWrapperInformation getNewFilterWizardPoolWrapperInformation() > { > return new SystemFilterPoolWrapperInformation(SystemResources.RESID_NEWFILTER_PAGE2_PROFILE_LABEL, SystemResources.RESID_NEWFILTER_PAGE2_PROFILE_TOOLTIP, > SystemResources.RESID_NEWFILTER_PAGE2_PROFILE_VERBIAGE); >Index: UI/org/eclipse/rse/ui/actions/SystemTestFilterStringAction.java >=================================================================== >RCS file: UI/org/eclipse/rse/ui/actions/SystemTestFilterStringAction.java >diff -N UI/org/eclipse/rse/ui/actions/SystemTestFilterStringAction.java >--- UI/org/eclipse/rse/ui/actions/SystemTestFilterStringAction.java 5 Jun 2007 11:36:56 -0000 1.4 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,103 +0,0 @@ >-/******************************************************************************* >- * Copyright (c) 2002, 2007 IBM Corporation and others. >- * All rights reserved. This program and the accompanying materials >- * are made available under the terms of the Eclipse Public License v1.0 >- * which accompanies this distribution, and is available at >- * http://www.eclipse.org/legal/epl-v10.html >- * >- * Initial Contributors: >- * The following IBM employees contributed to the Remote System Explorer >- * component that contains this file: David McKnight, Kushal Munir, >- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, >- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. >- * >- * Contributors: >- * {Name} (company) - description of contribution. >- *******************************************************************************/ >- >-package org.eclipse.rse.ui.actions; >-import org.eclipse.jface.dialogs.Dialog; >-import org.eclipse.rse.core.subsystems.ISubSystem; >-import org.eclipse.rse.internal.ui.SystemResources; >-import org.eclipse.rse.internal.ui.dialogs.SystemTestFilterStringDialog; >-import org.eclipse.swt.widgets.Shell; >- >- >-/** >- * The action for testing a given filter string by resolving it and showing the resolve results >- */ >-public class SystemTestFilterStringAction extends SystemBaseDialogAction >- >-{ >- >- protected ISubSystem subsystem; >- protected String filterString; >- protected SystemTestFilterStringDialog dlg; >- >- >- /** >- * Constructor when input subsystem and filter string are known already >- */ >- public SystemTestFilterStringAction(Shell shell, ISubSystem subsystem, String filterString) >- { >- super(SystemResources.ACTION_TESTFILTERSTRING_LABEL, SystemResources.ACTION_TESTFILTERSTRING_TOOLTIP, null, >- shell); >- allowOnMultipleSelection(false); >- setSubSystem(subsystem); >- setFilterString(filterString); >- } >- /** >- * Constructor when input subsystem and filter string are not known already. >- * @see #setSubSystem(ISubSystem) >- * @see #setFilterString(String) >- */ >- public SystemTestFilterStringAction(Shell shell) >- { >- this(shell, null, null); >- } >- >- /** >- * Set the subsystem within the context of which this filter string is to be tested. >- */ >- public void setSubSystem(ISubSystem subsystem) >- { >- this.subsystem = subsystem; >- } >- >- /** >- * Set the filter string to test >- */ >- public void setFilterString(String filterString) >- { >- this.filterString = filterString; >- } >- >- /** >- * If you decide to use the supplied run method as is, >- * then you must override this method to create and return >- * the dialog that is displayed by the default run method >- * implementation. >- * <p> >- * If you override run with your own, then >- * simply implement this to return null as it won't be used. >- * @see #run() >- */ >- protected Dialog createDialog(Shell shell) >- { >- //if (dlg == null) // I hoped to reduce memory requirements by re-using but doesn't work. Phil >- dlg = new SystemTestFilterStringDialog(shell, subsystem, filterString); >- //else >- //{ >- //dlg.reset(subsystem, filterString); >- //} >- return dlg; >- } >- >- /** >- * Required by parent. We just return null. >- */ >- protected Object getDialogValue(Dialog dlg) >- { >- return null; >- } >-} >Index: UI/org/eclipse/rse/ui/actions/SystemBaseSubMenuAction.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseSubMenuAction.java,v >retrieving revision 1.7 >diff -u -r1.7 SystemBaseSubMenuAction.java >--- UI/org/eclipse/rse/ui/actions/SystemBaseSubMenuAction.java 3 Apr 2008 17:53:57 -0000 1.7 >+++ UI/org/eclipse/rse/ui/actions/SystemBaseSubMenuAction.java 4 Apr 2008 15:55:35 -0000 >@@ -42,7 +42,7 @@ > > { > >- protected SystemSubMenuManager subMenu = null; >+ private SystemSubMenuManager subMenu = null; > protected String actionLabel; > protected String menuID; > protected boolean createMenuEachTime = true; >Index: UI/org/eclipse/rse/ui/RSEUIPlugin.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java,v >retrieving revision 1.73 >diff -u -r1.73 RSEUIPlugin.java >--- UI/org/eclipse/rse/ui/RSEUIPlugin.java 6 Mar 2008 12:30:18 -0000 1.73 >+++ UI/org/eclipse/rse/ui/RSEUIPlugin.java 4 Apr 2008 15:55:35 -0000 >@@ -38,6 +38,7 @@ > import java.net.URL; > import java.util.Vector; > >+import org.eclipse.core.runtime.IAdapterFactory; > import org.eclipse.core.runtime.IAdapterManager; > import org.eclipse.core.runtime.Platform; > import org.eclipse.core.runtime.jobs.Job; >@@ -417,7 +418,7 @@ > * For fastpath access to our adapters for non-local objects in our model. > * Exploits the knowledge we use singleton adapters. > */ >- public SystemViewAdapterFactory getSystemViewAdapterFactory() >+ public IAdapterFactory getSystemViewAdapterFactory() > { > return svaf; > } >Index: UI/org/eclipse/rse/internal/ui/view/monitor/SystemMonitorViewPart.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/SystemMonitorViewPart.java,v >retrieving revision 1.9 >diff -u -r1.9 SystemMonitorViewPart.java >--- UI/org/eclipse/rse/internal/ui/view/monitor/SystemMonitorViewPart.java 18 Mar 2008 18:29:10 -0000 1.9 >+++ UI/org/eclipse/rse/internal/ui/view/monitor/SystemMonitorViewPart.java 4 Apr 2008 15:55:34 -0000 >@@ -25,7 +25,7 @@ > > import java.util.ArrayList; > import java.util.Vector; >- >+ > import org.eclipse.core.runtime.IAdaptable; > import org.eclipse.jface.action.IMenuManager; > import org.eclipse.jface.action.IStatusLineManager; >@@ -49,7 +49,6 @@ > import org.eclipse.rse.internal.ui.SystemPropertyResources; > import org.eclipse.rse.internal.ui.SystemResources; > import org.eclipse.rse.internal.ui.view.SystemTableTreeViewProvider; >-import org.eclipse.rse.internal.ui.view.SystemTableViewColumnManager; > import org.eclipse.rse.services.clientserver.messages.SystemMessage; > import org.eclipse.rse.ui.ISystemIconConstants; > import org.eclipse.rse.ui.RSEUIPlugin; >@@ -58,6 +57,7 @@ > import org.eclipse.rse.ui.messages.ISystemMessageLine; > import org.eclipse.rse.ui.model.ISystemShellProvider; > import org.eclipse.rse.ui.view.IRSEViewPart; >+import org.eclipse.rse.ui.view.ISystemTableViewColumnManager; > import org.eclipse.rse.ui.view.ISystemViewElementAdapter; > import org.eclipse.rse.ui.view.SystemTableView; > import org.eclipse.swt.SWT; >@@ -311,7 +311,7 @@ > class SelectColumnsDialog extends SystemPromptDialog > { > private ISystemViewElementAdapter _adapter; >- private SystemTableViewColumnManager _columnManager; >+ private ISystemTableViewColumnManager _columnManager; > private IPropertyDescriptor[] _uniqueDescriptors; > private ArrayList _currentDisplayedDescriptors; > private ArrayList _availableDescriptors; >@@ -325,7 +325,7 @@ > private Button _downButton; > > >- public SelectColumnsDialog(Shell shell, ISystemViewElementAdapter viewAdapter, SystemTableViewColumnManager columnManager) >+ public SelectColumnsDialog(Shell shell, ISystemViewElementAdapter viewAdapter, ISystemTableViewColumnManager columnManager) > { > super(shell, SystemResources.RESID_TABLE_SELECT_COLUMNS_LABEL); > setToolTipText(SystemResources.RESID_TABLE_SELECT_COLUMNS_TOOLTIP); >@@ -600,7 +600,7 @@ > public void run() > { > SystemTableView viewer = getViewer(); >- SystemTableViewColumnManager mgr = viewer.getColumnManager(); >+ ISystemTableViewColumnManager mgr = viewer.getColumnManager(); > ISystemViewElementAdapter adapter = viewer.getAdapterForContents(); > SelectColumnsDialog dlg = new SelectColumnsDialog(getShell(), adapter, mgr); > if (dlg.open() == Window.OK) >Index: UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizard.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizard.java,v >retrieving revision 1.14 >diff -u -r1.14 SystemNewFilterWizard.java >--- UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizard.java 15 Mar 2008 00:54:49 -0000 1.14 >+++ UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizard.java 4 Apr 2008 15:55:36 -0000 >@@ -77,7 +77,7 @@ > extends AbstractSystemWizard > { > protected SystemNewFilterWizardMainPage mainPage; >- protected SystemNewFilterWizardNamePage namePage; >+ private SystemNewFilterWizardNamePage namePage; > protected SystemNewFilterWizardInfoPage infoPage; > protected ISystemFilterContainer filterContainer; > protected ISystemFilterPool parentPool; >@@ -326,12 +326,10 @@ > return mainPage; > } > /** >- * Extendable point for child classes. You don't need to override typically though. >- * <p> > * By default, this page uses the wizard page title as set in setWizardPageTitle(...) or the constructor. > * @return the wizard page prompting for the filter name and parent filter pool > */ >- protected SystemNewFilterWizardNamePage createNamePage() >+ private SystemNewFilterWizardNamePage createNamePage() > { > namePage = new SystemNewFilterWizardNamePage(this, parentPool, configurator); > return namePage; >Index: UI/org/eclipse/rse/ui/dialogs/SystemSelectAnythingDialog.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSelectAnythingDialog.java,v >retrieving revision 1.7 >diff -u -r1.7 SystemSelectAnythingDialog.java >--- UI/org/eclipse/rse/ui/dialogs/SystemSelectAnythingDialog.java 26 Nov 2007 20:11:13 -0000 1.7 >+++ UI/org/eclipse/rse/ui/dialogs/SystemSelectAnythingDialog.java 4 Apr 2008 15:55:35 -0000 >@@ -48,10 +48,10 @@ > { > > _view = new SystemViewForm(getShell(), parent, SWT.NONE, getInputProvider(), true, this); >- _view.getSystemView().addSelectionChangedListener(this); >+ _view.getSystemTree().addSelectionChangedListener(this); > > if (_filter != null){ >- _view.getSystemView().addFilter(_filter); >+ _view.getSystemTree().addFilter(_filter); > } > > return _view.getTreeControl(); >@@ -104,7 +104,7 @@ > _filter = filter; > if (_view != null) > { >- _view.getSystemView().addFilter(filter); >+ _view.getSystemTree().addFilter(filter); > } > > } >Index: UI/org/eclipse/rse/ui/dialogs/SystemRemoteResourceDialog.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRemoteResourceDialog.java,v >retrieving revision 1.14 >diff -u -r1.14 SystemRemoteResourceDialog.java >--- UI/org/eclipse/rse/ui/dialogs/SystemRemoteResourceDialog.java 14 Mar 2008 18:23:35 -0000 1.14 >+++ UI/org/eclipse/rse/ui/dialogs/SystemRemoteResourceDialog.java 4 Apr 2008 15:55:35 -0000 >@@ -23,10 +23,11 @@ > import org.eclipse.rse.core.IRSESystemType; > import org.eclipse.rse.core.model.IHost; > import org.eclipse.rse.internal.ui.view.SystemResourceSelectionForm; >-import org.eclipse.rse.internal.ui.view.SystemResourceSelectionInputProvider; > import org.eclipse.rse.ui.SystemActionViewerFilter; > import org.eclipse.rse.ui.messages.ISystemMessageLine; > import org.eclipse.rse.ui.validators.IValidatorRemoteSelection; >+import org.eclipse.rse.ui.view.ISystemTree; >+import org.eclipse.rse.ui.view.SystemResourceSelectionInputProvider; > import org.eclipse.swt.widgets.Composite; > import org.eclipse.swt.widgets.Control; > import org.eclipse.swt.widgets.Shell; >@@ -34,7 +35,7 @@ > > public abstract class SystemRemoteResourceDialog extends SystemPromptDialog > { >- protected SystemResourceSelectionForm _form; >+ private SystemResourceSelectionForm _form; > private SystemResourceSelectionInputProvider _inputProvider; > private Object _preSelection; > private IValidatorRemoteSelection _selectionValidator; >@@ -275,7 +276,25 @@ > _form.toggleShowPropertySheet(getShell(), getContents()); > return true; > } >+ >+ /** >+ * Returns the system tree >+ * @return the system tree >+ */ >+ public ISystemTree getSystemTree() >+ { >+ return _form.getSystemTree(); >+ } > >+ /** >+ * Indicates whether the page for the form is complete or not. >+ * @return true if the page associated with the form is complete >+ */ >+ public boolean isPageComplete() >+ { >+ return _form.isPageComplete(); >+ } >+ > public abstract SystemActionViewerFilter getViewerFilter(); > public abstract String getVerbiage(); > public abstract String getTreeTip(); >Index: UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterPoolWizardInterface.java >=================================================================== >RCS file: UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterPoolWizardInterface.java >diff -N UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterPoolWizardInterface.java >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterPoolWizardInterface.java 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,28 @@ >+/******************************************************************************* >+ * Copyright (c) 2002, 2007 IBM Corporation and others. >+ * All rights reserved. This program and the accompanying materials >+ * are made available under the terms of the Eclipse Public License v1.0 >+ * which accompanies this distribution, and is available at >+ * http://www.eclipse.org/legal/epl-v10.html >+ * >+ * Initial Contributors: >+ * The following IBM employees contributed to the Remote System Explorer >+ * component that contains this file: David McKnight, Kushal Munir, >+ * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, >+ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. >+ * >+ * Contributors: >+ * {Name} (company) - description of contribution. >+ *******************************************************************************/ >+ >+package org.eclipse.rse.ui.filters.dialogs; >+import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInterface; >+import org.eclipse.rse.ui.wizards.ISystemWizard; >+ >+/** >+ * An interface for filter pool wizards to implement >+ */ >+public interface SystemFilterPoolWizardInterface >+ extends ISystemWizard, SystemFilterPoolDialogInterface >+{ >+} >Index: UI/org/eclipse/rse/ui/filters/SystemFilterPoolDialogOutputs.java >=================================================================== >RCS file: UI/org/eclipse/rse/ui/filters/SystemFilterPoolDialogOutputs.java >diff -N UI/org/eclipse/rse/ui/filters/SystemFilterPoolDialogOutputs.java >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ UI/org/eclipse/rse/ui/filters/SystemFilterPoolDialogOutputs.java 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,37 @@ >+/******************************************************************************* >+ * Copyright (c) 2002, 2007 IBM Corporation and others. >+ * All rights reserved. This program and the accompanying materials >+ * are made available under the terms of the Eclipse Public License v1.0 >+ * which accompanies this distribution, and is available at >+ * http://www.eclipse.org/legal/epl-v10.html >+ * >+ * Initial Contributors: >+ * The following IBM employees contributed to the Remote System Explorer >+ * component that contains this file: David McKnight, Kushal Munir, >+ * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, >+ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. >+ * >+ * Contributors: >+ * {Name} (company) - description of contribution. >+ *******************************************************************************/ >+ >+package org.eclipse.rse.ui.filters; >+//import org.eclipse.rse.core.*; >+import org.eclipse.rse.core.filters.ISystemFilterPool; >+import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement; >+ >+ >+ >+/** >+ * A class capturing the attributes commonly returned by dialogs that >+ * work with filter pools. >+ */ >+public class SystemFilterPoolDialogOutputs >+{ >+ >+ >+ public String filterPoolName; >+ public String filterPoolManagerName; >+ public SystemSimpleContentElement filterPoolTreeRoot; >+ public ISystemFilterPool newPool; >+} >Index: UI/org/eclipse/rse/ui/filters/SystemFilterPoolDialogInputs.java >=================================================================== >RCS file: UI/org/eclipse/rse/ui/filters/SystemFilterPoolDialogInputs.java >diff -N UI/org/eclipse/rse/ui/filters/SystemFilterPoolDialogInputs.java >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ UI/org/eclipse/rse/ui/filters/SystemFilterPoolDialogInputs.java 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,46 @@ >+/******************************************************************************* >+ * Copyright (c) 2002, 2007 IBM Corporation and others. >+ * All rights reserved. This program and the accompanying materials >+ * are made available under the terms of the Eclipse Public License v1.0 >+ * which accompanies this distribution, and is available at >+ * http://www.eclipse.org/legal/epl-v10.html >+ * >+ * Initial Contributors: >+ * The following IBM employees contributed to the Remote System Explorer >+ * component that contains this file: David McKnight, Kushal Munir, >+ * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, >+ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. >+ * >+ * Contributors: >+ * {Name} (company) - description of contribution. >+ *******************************************************************************/ >+ >+package org.eclipse.rse.ui.filters; >+//import org.eclipse.rse.core.*; >+import org.eclipse.rse.core.filters.ISystemFilterPoolManager; >+import org.eclipse.rse.core.filters.ISystemFilterPoolManagerProvider; >+import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager; >+import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement; >+import org.eclipse.rse.ui.filters.dialogs.SystemFilterDialogInputs; >+ >+ >+ >+/** >+ * A class capturing the attributes commonly needed by dialogs that >+ * work with filter pools. >+ */ >+public class SystemFilterPoolDialogInputs extends SystemFilterDialogInputs >+{ >+ >+ >+ public ISystemFilterPoolManagerProvider poolManagerProvider = null; >+ public ISystemFilterPoolManager[] poolManagers = null; >+ public ISystemFilterPoolReferenceManager refManager = null; >+ public int mgrSelection = 0; >+ public String poolNamePrompt; >+ public String poolNameTip; >+ public String poolMgrNamePrompt; >+ public String poolMgrNameTip; >+ >+ public SystemSimpleContentElement filterPoolTreeRoot; >+} >Index: UI/org/eclipse/rse/ui/view/ISystemSelectRemoteObjectAPIProvider.java >=================================================================== >RCS file: UI/org/eclipse/rse/ui/view/ISystemSelectRemoteObjectAPIProvider.java >diff -N UI/org/eclipse/rse/ui/view/ISystemSelectRemoteObjectAPIProvider.java >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ UI/org/eclipse/rse/ui/view/ISystemSelectRemoteObjectAPIProvider.java 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,98 @@ >+/******************************************************************************** >+ * Copyright (c) 2008 IBM Corporation. All rights reserved. >+ * This program and the accompanying materials are made available under the terms >+ * of the Eclipse Public License v1.0 which accompanies this distribution, and is >+ * available at http://www.eclipse.org/legal/epl-v10.html >+ * >+ * Initial Contributors: >+ * The following IBM employees contributed to the Remote System Explorer >+ * component that contains this file: David McKnight. >+ * >+ * Contributors: >+ * {Name} (company) - description of contribution. >+ ********************************************************************************/ >+package org.eclipse.rse.ui.view; >+ >+import org.eclipse.rse.core.IRSESystemType; >+import org.eclipse.rse.core.filters.ISystemFilter; >+import org.eclipse.rse.core.model.IHost; >+import org.eclipse.rse.core.model.ISystemViewInputProvider; >+ >+public interface ISystemSelectRemoteObjectAPIProvider >+ extends ISystemViewInputProvider >+{ >+ /** >+ * This method is called by the connection adapter when the user expands >+ * a connection. This method must return the child objects to show for that >+ * connection. >+ */ >+ public Object[] getConnectionChildren(IHost selectedConnection); >+ >+ /** >+ * Get the name of the item to select when the first filter is expanded. >+ * Called by the filter adapter. >+ */ >+ public String getPreSelectFilterChild(); >+ >+ /** >+ * Get the actual object of the item to select when the first filter is expanded. >+ * Called by the GUI form after expansion, so it can select this object >+ */ >+ public Object getPreSelectFilterChildObject(); >+ >+ /** >+ * Set the filter string to use to resolve the inputs. >+ * If this is an absolute filter string, it gets turned into a quick filter string, >+ * so that the user sees it and can expand it. If it is a relative filter string >+ * to apply to all expansions, it is used to decorate all filtering as the user drills down. >+ */ >+ public void setFilterString(String string); >+ >+ /** >+ * Set actual child object of the first filter to preselect. Called >+ * by the filter adapter once the children are resolved and a match on >+ * the name is found. >+ */ >+ public void setPreSelectFilterChildObject(Object obj); >+ >+ /** >+ * Set child of the first filter to preselect >+ */ >+ public void setPreSelectFilterChild(String name); >+ >+ /** >+ * Set the quick filters to be exposed to the user. These will be shown to the >+ * user when they expand a connection. >+ * @see org.eclipse.rse.core.filters.SystemFilterSimple >+ */ >+ public void setQuickFilters(ISystemFilter[] filters); >+ >+ >+ /** >+ * Specify whether the user should see the "New Connection..." special connection prompt >+ */ >+ public void setShowNewConnectionPrompt(boolean show); >+ >+ >+ /** >+ * Default or Restrict to a specific connection. >+ * If default mode, it is preselected. >+ * If only mode, it is the only connection listed. >+ * @param connection The connection to default or restrict to >+ * @param onlyMode true if this is to be the only connection shown in the list >+ */ >+ public void setSystemConnection(IHost connection, boolean onlyMode); >+ >+ >+ /** >+ * Specify system types to restrict what types of connections >+ * the user can create, and see. >+ * This will override subsystemConfigurationId,if that has been set! >+ * >+ * @param systemTypes An array of system types, or >+ * <code>null</code> to allow all registered valid system types. >+ * A system type is valid if at least one subsystem configuration >+ * is registered against it. >+ */ >+ public void setSystemTypes(IRSESystemType[] systemTypes); >+} >Index: UI/org/eclipse/rse/ui/filters/SystemFilterPoolDialogInterface.java >=================================================================== >RCS file: UI/org/eclipse/rse/ui/filters/SystemFilterPoolDialogInterface.java >diff -N UI/org/eclipse/rse/ui/filters/SystemFilterPoolDialogInterface.java >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ UI/org/eclipse/rse/ui/filters/SystemFilterPoolDialogInterface.java 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,41 @@ >+/******************************************************************************* >+ * Copyright (c) 2002, 2007 IBM Corporation and others. >+ * All rights reserved. This program and the accompanying materials >+ * are made available under the terms of the Eclipse Public License v1.0 >+ * which accompanies this distribution, and is available at >+ * http://www.eclipse.org/legal/epl-v10.html >+ * >+ * Initial Contributors: >+ * The following IBM employees contributed to the Remote System Explorer >+ * component that contains this file: David McKnight, Kushal Munir, >+ * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, >+ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. >+ * >+ * Contributors: >+ * {Name} (company) - description of contribution. >+ *******************************************************************************/ >+ >+package org.eclipse.rse.ui.filters; >+import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction; >+ >+ >+/** >+ * Common interface for dialogs or wizards that work with filter pools. >+ */ >+public interface SystemFilterPoolDialogInterface >+{ >+ >+ >+ /** >+ * Allow base action to pass instance of itself for callback to get info >+ */ >+ public void setFilterPoolDialogActionCaller(SystemFilterAbstractFilterPoolAction caller); >+ /** >+ * Return an object containing user-specified information pertinent to filter pool actions >+ */ >+ public SystemFilterPoolDialogOutputs getFilterPoolDialogOutputs(); >+ /** >+ * Set the help context id for this wizard >+ */ >+ public void setHelpContextId(String id); >+} >Index: UI/org/eclipse/rse/ui/view/ISystemTableViewColumnManager.java >=================================================================== >RCS file: UI/org/eclipse/rse/ui/view/ISystemTableViewColumnManager.java >diff -N UI/org/eclipse/rse/ui/view/ISystemTableViewColumnManager.java >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ UI/org/eclipse/rse/ui/view/ISystemTableViewColumnManager.java 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,23 @@ >+/******************************************************************************** >+ * Copyright (c) 2008 IBM Corporation. All rights reserved. >+ * This program and the accompanying materials are made available under the terms >+ * of the Eclipse Public License v1.0 which accompanies this distribution, and is >+ * available at http://www.eclipse.org/legal/epl-v10.html >+ * >+ * Initial Contributors: >+ * The following IBM employees contributed to the Remote System Explorer >+ * component that contains this file: David McKnight. >+ * >+ * Contributors: >+ * {Name} (company) - description of contribution. >+ ********************************************************************************/ >+package org.eclipse.rse.ui.view; >+ >+import org.eclipse.ui.views.properties.IPropertyDescriptor; >+ >+public interface ISystemTableViewColumnManager { >+ >+ public IPropertyDescriptor[] getVisibleDescriptors(ISystemViewElementAdapter adapter); >+ >+ public void setCustomDescriptors(ISystemViewElementAdapter adapter, IPropertyDescriptor[] descriptors); >+} >Index: UI/org/eclipse/rse/ui/view/SystemResourceSelectionInputProvider.java >=================================================================== >RCS file: UI/org/eclipse/rse/ui/view/SystemResourceSelectionInputProvider.java >diff -N UI/org/eclipse/rse/ui/view/SystemResourceSelectionInputProvider.java >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ UI/org/eclipse/rse/ui/view/SystemResourceSelectionInputProvider.java 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,142 @@ >+/******************************************************************************** >+ * Copyright (c) 2004, 2007 IBM Corporation and others. All rights reserved. >+ * This program and the accompanying materials are made available under the terms >+ * of the Eclipse Public License v1.0 which accompanies this distribution, and is >+ * available at http://www.eclipse.org/legal/epl-v10.html >+ * >+ * Initial Contributors: >+ * The following IBM employees contributed to the Remote System Explorer >+ * component that contains this file: David McKnight, Kushal Munir, >+ * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, >+ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. >+ * >+ * Contributors: >+ * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType >+ * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry >+ * Martin Oberhuber (Wind River) - [202866] Fix exceptions in RSE browse dialog when SystemRegistry is not yet fully initialized >+ ********************************************************************************/ >+ >+package org.eclipse.rse.ui.view; >+import org.eclipse.rse.core.IRSESystemType; >+import org.eclipse.rse.core.RSECorePlugin; >+import org.eclipse.rse.core.model.IHost; >+import org.eclipse.rse.core.model.ISystemRegistry; >+import org.eclipse.rse.core.subsystems.ISubSystem; >+ >+ >+public abstract class SystemResourceSelectionInputProvider extends SystemAbstractAPIProvider >+{ >+ private IHost _connection = null; >+ private boolean _onlyConnection = false; >+ private boolean _allowNew = true; >+ private IRSESystemType[] _systemTypes; >+ private String _category = null; >+ >+ public SystemResourceSelectionInputProvider(IHost connection) >+ { >+ _connection = connection; >+ } >+ >+ public SystemResourceSelectionInputProvider() >+ { >+ // choose random host >+ ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); >+ IHost[] hosts = registry.getHosts(); >+ if (hosts != null && hosts.length>0) { >+ _connection = hosts[0]; >+ } >+ } >+ >+ public IHost getSystemConnection() >+ { >+ return _connection; >+ } >+ >+ public boolean allowMultipleConnections() >+ { >+ return !_onlyConnection; >+ } >+ >+ public void setAllowNewConnection(boolean flag) >+ { >+ _allowNew = flag; >+ } >+ >+ public boolean allowNewConnection() >+ { >+ return _allowNew; >+ } >+ >+ public void setSystemConnection(IHost connection, boolean onlyConnection) >+ { >+ _connection = connection; >+ _onlyConnection = onlyConnection; >+ } >+ >+ public IRSESystemType[] getSystemTypes() >+ { >+ return _systemTypes; >+ } >+ >+ public void setSystemTypes(IRSESystemType[] types) >+ { >+ _systemTypes = types; >+ } >+ >+ public Object[] getSystemViewRoots() >+ { >+ if (_connection == null) >+ { >+ ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); >+ IHost[] hosts = registry.getHosts(); >+ if (hosts!=null && hosts.length!=0) { >+ _connection = registry.getHosts()[0]; >+ } >+ } >+ return getConnectionChildren(_connection); >+ } >+ >+ public boolean hasSystemViewRoots() >+ { >+ return false; >+ } >+ >+ public Object[] getConnectionChildren(IHost selectedConnection) >+ { >+ if (selectedConnection != null) >+ { >+ ISubSystem ss = getSubSystem(selectedConnection); >+ if (ss!=null) { >+ return ss.getChildren(); >+ } >+ } >+ return new Object[0]; >+ } >+ >+ public boolean hasConnectionChildren(IHost selectedConnection) >+ { >+ if (selectedConnection != null) >+ { >+ ISubSystem ss = getSubSystem(selectedConnection); >+ if (ss!=null) { >+ return ss.hasChildren(); >+ } >+ } >+ return false; >+ } >+ >+ protected abstract ISubSystem getSubSystem(IHost selectedConnection); >+ >+ >+ public void setCategory(String category) >+ { >+ _category = category; >+ } >+ >+ public String getCategory() >+ { >+ return _category; >+ } >+ >+ >+} >Index: UI/org/eclipse/rse/ui/view/SystemAbstractAPIProvider.java >=================================================================== >RCS file: UI/org/eclipse/rse/ui/view/SystemAbstractAPIProvider.java >diff -N UI/org/eclipse/rse/ui/view/SystemAbstractAPIProvider.java >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ UI/org/eclipse/rse/ui/view/SystemAbstractAPIProvider.java 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,210 @@ >+/******************************************************************************** >+ * Copyright (c) 2002, 2008 IBM Corporation and others. All rights reserved. >+ * This program and the accompanying materials are made available under the terms >+ * of the Eclipse Public License v1.0 which accompanies this distribution, and is >+ * available at http://www.eclipse.org/legal/epl-v10.html >+ * >+ * Initial Contributors: >+ * The following IBM employees contributed to the Remote System Explorer >+ * component that contains this file: David McKnight, Kushal Munir, >+ * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, >+ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. >+ * >+ * Contributors: >+ * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry >+ * Tobias Schwarz (Wind River) - [173267] "empty list" should not be displayed >+ * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core >+ * Martin Oberhuber (Wind River) - [218524][api] Remove deprecated ISystemViewInputProvider#getShell() >+ ********************************************************************************/ >+ >+package org.eclipse.rse.ui.view; >+import org.eclipse.core.runtime.Platform; >+import org.eclipse.core.runtime.Preferences; >+import org.eclipse.jface.viewers.Viewer; >+import org.eclipse.rse.core.RSECorePlugin; >+import org.eclipse.rse.core.model.ISystemMessageObject; >+import org.eclipse.rse.core.model.ISystemRegistry; >+import org.eclipse.rse.core.model.ISystemViewInputProvider; >+import org.eclipse.rse.core.model.SystemMessageObject; >+import org.eclipse.rse.ui.ISystemMessages; >+import org.eclipse.rse.ui.ISystemPreferencesConstants; >+import org.eclipse.rse.ui.RSEUIPlugin; >+import org.eclipse.swt.widgets.Shell; >+ >+ >+ >+/** >+ * This is a base class that a provider of root nodes to the remote systems tree viewer part can >+ * use as a parent class. >+ */ >+public abstract class SystemAbstractAPIProvider >+ implements ISystemViewInputProvider >+{ >+ protected Viewer viewer; >+ protected ISystemRegistry sr; >+ >+ protected Object[] emptyList = new Object[0]; >+ protected Object[] msgList = new Object[1]; >+ /** >+ * @deprecated Use {@link #checkForEmptyList(Object[], Object, boolean)} instead. >+ */ >+ protected SystemMessageObject nullObject = null; >+ protected SystemMessageObject canceledObject = null; >+ protected SystemMessageObject errorObject = null; >+ >+ private Preferences fPrefStore = null; >+ >+ /** >+ * Constructor >+ */ >+ public SystemAbstractAPIProvider() >+ { >+ super(); >+ sr = RSECorePlugin.getTheSystemRegistry(); >+ } >+ >+ /** >+ * This is the method required by the IAdaptable interface. >+ * Given an adapter class type, return an object castable to the type, or >+ * null if this is not possible. >+ */ >+ public Object getAdapter(Class adapterType) >+ { >+ return Platform.getAdapterManager().getAdapter(this, adapterType); >+ } >+ >+ /* >+ * (non-Javadoc) >+ * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#setViewer(java.lang.Object) >+ */ >+ public void setViewer(Object viewer) >+ { >+ this.viewer = (Viewer)viewer; >+ } >+ >+ /* >+ * (non-Javadoc) >+ * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#getViewer() >+ */ >+ public Object getViewer() >+ { >+ return viewer; >+ } >+ >+ protected final void initMsgObjects() >+ { >+ nullObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_EMPTY),ISystemMessageObject.MSGTYPE_EMPTY, null); >+ canceledObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_LIST_CANCELED),ISystemMessageObject.MSGTYPE_CANCEL, null); >+ errorObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_FAILED),ISystemMessageObject.MSGTYPE_ERROR, null); >+ } >+ >+ /** >+ * <i>Callable by subclasses. Do not override</i><br> >+ * In getChildren, return <samp>checkForEmptyList(children, parent, true/false)<.samp> >+ * versus your array directly. This method checks for a null array which is >+ * not allowed and replaces it with an empty array. >+ * If true is passed then it returns the "Empty list" message object if the array is null or empty >+ * >+ * @param children The list of children. >+ * @param parent The parent for the children. >+ * @param returnNullMsg <code>true</code> if an "Empty List" message should be returned. >+ * @return The list of children, a list with the "Empty List" message object or an empty list. >+ */ >+ protected Object[] checkForEmptyList(Object[] children, Object parent, boolean returnNullMsg) { >+ if ((children == null) || (children.length == 0)) { >+ if (fPrefStore == null) { >+ fPrefStore = RSEUIPlugin.getDefault().getPluginPreferences(); >+ } >+ if (!returnNullMsg >+ || (fPrefStore != null && !fPrefStore >+ .getBoolean(ISystemPreferencesConstants.SHOW_EMPTY_LISTS))) { >+ return emptyList; >+ } else { >+ return new Object[] { >+ new SystemMessageObject( >+ RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_EMPTY), >+ ISystemMessageObject.MSGTYPE_EMPTY, >+ parent)}; >+ } >+ } >+ return children; >+ } >+ >+ /** >+ * In getChildren, return checkForNull(children, true/false) vs your array directly. >+ * This method checks for a null array which not allow and replaces it with an empty array. >+ * If true is passed then it returns the "Empty list" message object if the array is null or empty >+ * >+ * @deprecated Use {@link #checkForEmptyList(Object[], Object, boolean)} instead. >+ */ >+ protected Object[] checkForNull(Object[] children, boolean returnNullMsg) >+ { >+ if ((children == null) || (children.length==0)) >+ { >+ if (!returnNullMsg) >+ return emptyList; >+ else >+ { >+ if (nullObject == null) >+ initMsgObjects(); >+ msgList[0] = nullObject; >+ return msgList; >+ } >+ } >+ else >+ return children; >+ } >+ >+ /** >+ * Return the "Operation cancelled by user" msg as an object array so can be used to answer getChildren() >+ */ >+ protected Object[] getCancelledMessageObject() >+ { >+ if (canceledObject == null) >+ initMsgObjects(); >+ msgList[0] = canceledObject; >+ return msgList; >+ } >+ >+ /** >+ * Return the "Operation failed" msg as an object array so can be used to answer getChildren() >+ */ >+ protected Object[] getFailedMessageObject() >+ { >+ if (errorObject == null) >+ initMsgObjects(); >+ msgList[0] = errorObject; >+ return msgList; >+ } >+ >+ /** >+ * Return true if we are listing connections or not, so we know whether we are interested in >+ * connection-add events >+ */ >+ public boolean showingConnections() >+ { >+ return false; >+ } >+ >+ // ------------------ >+ // HELPER METHODS... >+ // ------------------ >+ /** >+ * Returns the implementation of ISystemViewElement for the given >+ * object. Returns null if the adapter is not defined or the >+ * object is not adaptable. >+ */ >+ protected ISystemViewElementAdapter getViewAdapter(Object o) >+ { >+ return SystemAdapterHelpers.getViewAdapter(o); >+ } >+ >+ /** >+ * Returns the implementation of ISystemRemoteElement for the given >+ * object. Returns null if this object does not adaptable to this. >+ */ >+ protected ISystemRemoteElementAdapter getRemoteAdapter(Object o) >+ { >+ return SystemAdapterHelpers.getRemoteAdapter(o); >+ } >+} >Index: UI/org/eclipse/rse/internal/ui/actions/SystemTestFilterStringAction.java >=================================================================== >RCS file: UI/org/eclipse/rse/internal/ui/actions/SystemTestFilterStringAction.java >diff -N UI/org/eclipse/rse/internal/ui/actions/SystemTestFilterStringAction.java >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ UI/org/eclipse/rse/internal/ui/actions/SystemTestFilterStringAction.java 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,96 @@ >+/******************************************************************************* >+ * Copyright (c) 2002, 2007 IBM Corporation and others. >+ * All rights reserved. This program and the accompanying materials >+ * are made available under the terms of the Eclipse Public License v1.0 >+ * which accompanies this distribution, and is available at >+ * http://www.eclipse.org/legal/epl-v10.html >+ * >+ * Initial Contributors: >+ * The following IBM employees contributed to the Remote System Explorer >+ * component that contains this file: David McKnight, Kushal Munir, >+ * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, >+ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. >+ * >+ * Contributors: >+ * {Name} (company) - description of contribution. >+ *******************************************************************************/ >+ >+package org.eclipse.rse.internal.ui.actions; >+import org.eclipse.jface.dialogs.Dialog; >+import org.eclipse.rse.core.subsystems.ISubSystem; >+import org.eclipse.rse.internal.ui.SystemResources; >+import org.eclipse.rse.internal.ui.dialogs.SystemTestFilterStringDialog; >+import org.eclipse.rse.ui.actions.SystemBaseDialogAction; >+import org.eclipse.swt.widgets.Shell; >+ >+ >+/** >+ * The action for testing a given filter string by resolving it and showing the resolve results >+ */ >+public class SystemTestFilterStringAction extends SystemBaseDialogAction >+ >+{ >+ >+ protected ISubSystem subsystem; >+ protected String filterString; >+ >+ /** >+ * Constructor when input subsystem and filter string are known already >+ */ >+ public SystemTestFilterStringAction(Shell shell, ISubSystem subsystem, String filterString) >+ { >+ super(SystemResources.ACTION_TESTFILTERSTRING_LABEL, SystemResources.ACTION_TESTFILTERSTRING_TOOLTIP, null, >+ shell); >+ allowOnMultipleSelection(false); >+ setSubSystem(subsystem); >+ setFilterString(filterString); >+ } >+ /** >+ * Constructor when input subsystem and filter string are not known already. >+ * @see #setSubSystem(ISubSystem) >+ * @see #setFilterString(String) >+ */ >+ public SystemTestFilterStringAction(Shell shell) >+ { >+ this(shell, null, null); >+ } >+ >+ /** >+ * Set the subsystem within the context of which this filter string is to be tested. >+ */ >+ public void setSubSystem(ISubSystem subsystem) >+ { >+ this.subsystem = subsystem; >+ } >+ >+ /** >+ * Set the filter string to test >+ */ >+ public void setFilterString(String filterString) >+ { >+ this.filterString = filterString; >+ } >+ >+ /** >+ * If you decide to use the supplied run method as is, >+ * then you must override this method to create and return >+ * the dialog that is displayed by the default run method >+ * implementation. >+ * <p> >+ * If you override run with your own, then >+ * simply implement this to return null as it won't be used. >+ * @see #run() >+ */ >+ protected Dialog createDialog(Shell shell) >+ { >+ return new SystemTestFilterStringDialog(shell, subsystem, filterString); >+ } >+ >+ /** >+ * Required by parent. We just return null. >+ */ >+ protected Object getDialogValue(Dialog dlg) >+ { >+ return null; >+ } >+} >#P org.eclipse.rse.processes.ui >Index: src/org/eclipse/rse/processes/ui/SystemProcessFilterStringEditPane.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/SystemProcessFilterStringEditPane.java,v >retrieving revision 1.14 >diff -u -r1.14 SystemProcessFilterStringEditPane.java >--- src/org/eclipse/rse/processes/ui/SystemProcessFilterStringEditPane.java 28 Feb 2008 22:10:54 -0000 1.14 >+++ src/org/eclipse/rse/processes/ui/SystemProcessFilterStringEditPane.java 4 Apr 2008 15:55:42 -0000 >@@ -28,6 +28,7 @@ > import org.eclipse.rse.internal.processes.ui.SystemProcessesResources; > import org.eclipse.rse.internal.processes.ui.view.SystemProcessStatesContentProvider; > import org.eclipse.rse.internal.ui.SystemResources; >+import org.eclipse.rse.internal.ui.actions.SystemTestFilterStringAction; > import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage; > import org.eclipse.rse.services.clientserver.messages.SystemMessage; > import org.eclipse.rse.services.clientserver.processes.HostProcessFilterImpl; >@@ -35,7 +36,6 @@ > import org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcessSubSystemConfiguration; > import org.eclipse.rse.ui.SystemBasePlugin; > import org.eclipse.rse.ui.SystemWidgetHelpers; >-import org.eclipse.rse.ui.actions.SystemTestFilterStringAction; > import org.eclipse.rse.ui.filters.SystemFilterStringEditPane; > import org.eclipse.rse.ui.messages.SystemMessageDialog; > import org.eclipse.rse.ui.validators.ValidatorIntegerInput; >@@ -93,9 +93,6 @@ > protected boolean dontStealFocus; > protected IRemoteProcessSubSystemConfiguration inputSubsystemConfiguration = null; > >- // actions >- protected SystemTestFilterStringAction testAction = null; >- > // constants > protected final static int SIZING_SELECTION_WIDGET_HEIGHT = 90; > protected final static int SIZING_SELECTION_WIDGET_WIDTH = 145; >#P org.eclipse.rse.files.ui >Index: src/org/eclipse/rse/internal/files/ui/search/SystemSearchRemoteFolderForm.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/search/SystemSearchRemoteFolderForm.java,v >retrieving revision 1.1 >diff -u -r1.1 SystemSearchRemoteFolderForm.java >--- src/org/eclipse/rse/internal/files/ui/search/SystemSearchRemoteFolderForm.java 16 Feb 2007 18:22:37 -0000 1.1 >+++ src/org/eclipse/rse/internal/files/ui/search/SystemSearchRemoteFolderForm.java 4 Apr 2008 15:55:44 -0000 >@@ -10,9 +10,9 @@ > package org.eclipse.rse.internal.files.ui.search; > > import org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm; >-import org.eclipse.rse.internal.ui.view.SystemSelectRemoteObjectAPIProviderImpl; > import org.eclipse.rse.subsystems.files.core.model.ISystemFileRemoteTypes; > import org.eclipse.rse.ui.messages.ISystemMessageLine; >+import org.eclipse.rse.ui.view.ISystemSelectRemoteObjectAPIProvider; > > /** > * The selection form to use is search selection dialogs. >@@ -32,7 +32,7 @@ > * Returns an instance of the search input provider {@link SystemSearchRemoteObjectAPIProvider} > * @see org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm#getInputProvider() > */ >- protected SystemSelectRemoteObjectAPIProviderImpl getInputProvider() { >+ protected ISystemSelectRemoteObjectAPIProvider getInputProvider() { > > if (inputProvider == null) { > // create the input provider that drives the contents of the tree >Index: src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFilesForm.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFilesForm.java,v >retrieving revision 1.12 >diff -u -r1.12 SystemSelectRemoteFilesForm.java >--- src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFilesForm.java 28 Feb 2008 22:22:36 -0000 1.12 >+++ src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFilesForm.java 4 Apr 2008 15:55:44 -0000 >@@ -511,7 +511,7 @@ > /** > * Get the action to run when "Select Types..." is pressed by the user > */ >- protected SystemSelectFileTypesAction getSelectTypesAction() >+ private SystemSelectFileTypesAction getSelectTypesAction() > { > if (typesAction == null) > typesAction = new SystemSelectFileTypesAction(getShell()); >Index: src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java,v >retrieving revision 1.19 >diff -u -r1.19 SystemSelectRemoteFileOrFolderForm.java >--- src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java 3 Apr 2008 20:57:55 -0000 1.19 >+++ src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java 4 Apr 2008 15:55:44 -0000 >@@ -54,6 +54,8 @@ > import org.eclipse.rse.ui.messages.ISystemMessageLine; > import org.eclipse.rse.ui.validators.IValidatorRemoteSelection; > import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; >+import org.eclipse.rse.ui.view.ISystemSelectRemoteObjectAPIProvider; >+import org.eclipse.rse.ui.view.ISystemTree; > import org.eclipse.rse.ui.view.SystemAdapterHelpers; > import org.eclipse.swt.SWT; > import org.eclipse.swt.graphics.Point; >@@ -106,8 +108,8 @@ > // GUI widgets > protected Label verbiageLabel, spacer1, spacer2; > protected Text nameEntryValue; >- protected SystemViewForm tree; >- protected SystemPropertySheetForm ps; >+ private SystemViewForm tree; >+ private SystemPropertySheetForm ps; > protected ISystemMessageLine msgLine; > protected Composite outerParent, ps_composite; > // inputs >@@ -135,7 +137,7 @@ > protected IHost outputConnection = null; > // state > //protected ResourceBundle rb; >- protected SystemSelectRemoteObjectAPIProviderImpl inputProvider = null; >+ protected ISystemSelectRemoteObjectAPIProvider inputProvider = null; > protected ISystemFilter preSelectFilter; > protected String preSelectFilterChild; > protected boolean preSelectRoot; >@@ -195,7 +197,7 @@ > * Returns the input provider that drives the contents of the tree > * Subclasses can override to provide custom tree contents > */ >- protected SystemSelectRemoteObjectAPIProviderImpl getInputProvider() >+ protected ISystemSelectRemoteObjectAPIProvider getInputProvider() > { > if (inputProvider == null) > { >@@ -568,14 +570,6 @@ > return outputConnection; > } > >- /** >- * Return the embedded System Tree object. >- * Will be null until createContents is called. >- */ >- public SystemViewForm getSystemViewForm() >- { >- return tree; >- } > > /** > * Return the multiple selection mode current setting >@@ -753,7 +747,7 @@ > //tree.setToolTipText(treeTip); //EXTREMELY ANNOYING! > if (autoExpandDepth != 0) > { >- tree.getSystemView().setAutoExpandLevel(autoExpandDepth); >+ tree.getSystemTree().setAutoExpandLevel(autoExpandDepth); > tree.reset(inputProvider); > } > >@@ -803,7 +797,7 @@ > */ > protected IHost internalGetConnection() > { >- Object parent = tree.getSystemView().getRootParent(); >+ Object parent = tree.getSystemTree().getRootParent(); > if (parent instanceof IHost) > { > return (IHost)parent; >@@ -1058,4 +1052,18 @@ > public void setAllowFolderSelection(boolean allow) { > allowFolderSelection = allow; > } >+ >+ /** >+ * Returns the system tree >+ * @return the system tree >+ */ >+ public ISystemTree getSystemTree() >+ { >+ return tree.getSystemTree(); >+ } >+ >+ public Object getSelectedParent() >+ { >+ return tree.getSelectedParent(); >+ } > } >\ No newline at end of file >Index: src/org/eclipse/rse/files/ui/widgets/SystemFileFilterStringEditPane.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemFileFilterStringEditPane.java,v >retrieving revision 1.7 >diff -u -r1.7 SystemFileFilterStringEditPane.java >--- src/org/eclipse/rse/files/ui/widgets/SystemFileFilterStringEditPane.java 13 Mar 2008 02:39:58 -0000 1.7 >+++ src/org/eclipse/rse/files/ui/widgets/SystemFileFilterStringEditPane.java 4 Apr 2008 15:55:43 -0000 >@@ -33,6 +33,7 @@ > import org.eclipse.rse.internal.files.ui.ISystemFileConstants; > import org.eclipse.rse.internal.files.ui.actions.SystemSelectFileTypesAction; > import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources; >+import org.eclipse.rse.internal.ui.actions.SystemTestFilterStringAction; > import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage; > import org.eclipse.rse.services.clientserver.messages.SystemMessage; > import org.eclipse.rse.subsystems.files.core.model.RemoteFileFilterString; >@@ -43,7 +44,6 @@ > import org.eclipse.rse.ui.RSEUIPlugin; > import org.eclipse.rse.ui.SystemBasePlugin; > import org.eclipse.rse.ui.SystemWidgetHelpers; >-import org.eclipse.rse.ui.actions.SystemTestFilterStringAction; > import org.eclipse.rse.ui.filters.SystemFilterStringEditPane; > import org.eclipse.rse.ui.messages.SystemMessageDialog; > import org.eclipse.rse.ui.validators.ISystemValidator; >@@ -97,8 +97,8 @@ > protected RemoteFileSubSystemConfiguration inputSubsystemConfiguration = null; > > // actions >- protected SystemTestFilterStringAction testAction = null; >- protected SystemSelectFileTypesAction typesAction = null; >+ private SystemTestFilterStringAction testAction = null; >+ private SystemSelectFileTypesAction typesAction = null; > > > /** >@@ -474,7 +474,7 @@ > /** > * Get the action to run when "Select Types..." is pressed by the user > */ >- protected SystemSelectFileTypesAction getSelectTypesAction() >+ private SystemSelectFileTypesAction getSelectTypesAction() > { > if (typesAction == null) > typesAction = new SystemSelectFileTypesAction(selectTypesButton.getShell()); >Index: src/org/eclipse/rse/files/ui/widgets/SaveAsForm.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SaveAsForm.java,v >retrieving revision 1.7 >diff -u -r1.7 SaveAsForm.java >--- src/org/eclipse/rse/files/ui/widgets/SaveAsForm.java 28 Feb 2008 22:22:36 -0000 1.7 >+++ src/org/eclipse/rse/files/ui/widgets/SaveAsForm.java 4 Apr 2008 15:55:43 -0000 >@@ -209,7 +209,7 @@ > if (fileNameText != null) > { > // simulate the parent file being selected... >- Object parentFile = tree.getSelectedParent(); >+ Object parentFile = getSelectedParent(); > > if (remoteFile.isFile()) > { >Index: src/org/eclipse/rse/files/ui/dialogs/SystemSelectRemoteFileOrFolderDialog.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemSelectRemoteFileOrFolderDialog.java,v >retrieving revision 1.10 >diff -u -r1.10 SystemSelectRemoteFileOrFolderDialog.java >--- src/org/eclipse/rse/files/ui/dialogs/SystemSelectRemoteFileOrFolderDialog.java 19 Jun 2007 17:11:21 -0000 1.10 >+++ src/org/eclipse/rse/files/ui/dialogs/SystemSelectRemoteFileOrFolderDialog.java 4 Apr 2008 15:55:42 -0000 >@@ -26,13 +26,12 @@ > import org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm; > import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources; > import org.eclipse.rse.internal.ui.SystemResources; >-import org.eclipse.rse.internal.ui.view.SystemView; >-import org.eclipse.rse.internal.ui.view.SystemViewForm; > import org.eclipse.rse.services.clientserver.messages.SystemMessage; > import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; > import org.eclipse.rse.ui.dialogs.SystemPromptDialog; > import org.eclipse.rse.ui.messages.ISystemMessageLine; > import org.eclipse.rse.ui.validators.IValidatorRemoteSelection; >+import org.eclipse.rse.ui.view.ISystemTree; > import org.eclipse.swt.widgets.Composite; > import org.eclipse.swt.widgets.Control; > import org.eclipse.swt.widgets.Shell; >@@ -402,14 +401,7 @@ > { > return multipleSelectionMode; > } >- /** >- * Return the embedded System Tree object. >- * Will be null until createContents is called. >- */ >- public SystemViewForm getSystemViewForm() >- { >- return form.getSystemViewForm(); >- } >+ > > // ------------------ > // PRIVATE METHODS... >@@ -421,7 +413,7 @@ > protected Control createContents(Composite parent) > { > Control control = super.createContents(parent); >- form.getSystemViewForm().getSystemView().addDoubleClickListener(new IDoubleClickListener() { >+ form.getSystemTree().addDoubleClickListener(new IDoubleClickListener() { > public void doubleClick(DoubleClickEvent event) { > handleDoubleClick(event); > } >@@ -435,7 +427,7 @@ > */ > protected void handleDoubleClick(DoubleClickEvent event) > { >- SystemView tree = form.getSystemViewForm().getSystemView(); >+ ISystemTree tree = form.getSystemTree(); > IStructuredSelection s = (IStructuredSelection) event.getSelection(); > Object element = s.getFirstElement(); > if (element == null) >@@ -609,4 +601,6 @@ > form.setAllowFolderSelection(allow); > } > } >+ >+ > } >\ No newline at end of file >Index: src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileSelectionInputProvider.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileSelectionInputProvider.java,v >retrieving revision 1.6 >diff -u -r1.6 SystemRemoteFileSelectionInputProvider.java >--- src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileSelectionInputProvider.java 5 Jun 2007 10:54:41 -0000 1.6 >+++ src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileSelectionInputProvider.java 4 Apr 2008 15:55:42 -0000 >@@ -19,8 +19,8 @@ > > import org.eclipse.rse.core.model.IHost; > import org.eclipse.rse.core.subsystems.ISubSystem; >-import org.eclipse.rse.internal.ui.view.SystemResourceSelectionInputProvider; > import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility; >+import org.eclipse.rse.ui.view.SystemResourceSelectionInputProvider; > > > public class SystemRemoteFileSelectionInputProvider extends >Index: src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileDialog.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileDialog.java,v >retrieving revision 1.8 >diff -u -r1.8 SystemRemoteFileDialog.java >--- src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileDialog.java 1 Jun 2007 12:52:15 -0000 1.8 >+++ src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileDialog.java 4 Apr 2008 15:55:42 -0000 >@@ -23,9 +23,9 @@ > import org.eclipse.jface.viewers.IStructuredSelection; > import org.eclipse.rse.core.model.IHost; > import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources; >-import org.eclipse.rse.internal.ui.view.SystemView; > import org.eclipse.rse.ui.SystemActionViewerFilter; > import org.eclipse.rse.ui.dialogs.SystemRemoteResourceDialog; >+import org.eclipse.rse.ui.view.ISystemTree; > import org.eclipse.swt.widgets.Composite; > import org.eclipse.swt.widgets.Control; > import org.eclipse.swt.widgets.Shell; >@@ -70,7 +70,7 @@ > protected Control createContents(Composite parent) > { > Control control = super.createContents(parent); >- _form.getSystemViewForm().getSystemView().addDoubleClickListener(new IDoubleClickListener() { >+ getSystemTree().addDoubleClickListener(new IDoubleClickListener() { > public void doubleClick(DoubleClickEvent event) { > handleDoubleClick(event); > } >@@ -84,12 +84,12 @@ > */ > protected void handleDoubleClick(DoubleClickEvent event) > { >- SystemView tree = _form.getSystemViewForm().getSystemView(); >+ ISystemTree tree = getSystemTree(); > IStructuredSelection s = (IStructuredSelection) event.getSelection(); > Object element = s.getFirstElement(); > if (element == null) > return; >- if (_form.isPageComplete() && !tree.isExpandable(element)) >+ if (isPageComplete() && !tree.isExpandable(element)) > { > setReturnCode(OK); > if (processOK()) >#P org.eclipse.rse.subsystems.files.core >Index: src/org/eclipse/rse/internal/subsystems/files/core/SystemFileAPIProviderImpl.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileAPIProviderImpl.java,v >retrieving revision 1.8 >diff -u -r1.8 SystemFileAPIProviderImpl.java >--- src/org/eclipse/rse/internal/subsystems/files/core/SystemFileAPIProviderImpl.java 30 May 2007 18:09:33 -0000 1.8 >+++ src/org/eclipse/rse/internal/subsystems/files/core/SystemFileAPIProviderImpl.java 4 Apr 2008 15:55:45 -0000 >@@ -21,9 +21,9 @@ > import org.eclipse.rse.core.model.IHost; > import org.eclipse.rse.core.model.ISystemRegistry; > import org.eclipse.rse.core.subsystems.ISubSystem; >-import org.eclipse.rse.internal.ui.view.SystemAbstractAPIProvider; > import org.eclipse.rse.subsystems.files.core.model.ISystemFileAPIProvider; > import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; >+import org.eclipse.rse.ui.view.SystemAbstractAPIProvider; > > > /**
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 225506
:
94779
|
94792
|
94827
| 94875 |
95073
|
95075
|
95076
|
95491