View | Details | Raw Unified | Return to bug 225506 | Differences between
and this patch

Collapse All | Expand All

(-)UI/org/eclipse/rse/ui/view/SystemTableView.java (-3 / +3 lines)
Lines 487-493 Link Here
487
			return new IPropertyDescriptor[0];
487
			return new IPropertyDescriptor[0];
488
	}
488
	}
489
489
490
	public SystemTableViewColumnManager getColumnManager()
490
	public ISystemTableViewColumnManager getColumnManager()
491
	{
491
	{
492
	    return _columnManager;
492
	    return _columnManager;
493
	}
493
	}
Lines 1406-1412 Link Here
1406
	 * Get the common "Open to->" action for opening a new Remote System Explorer view,
1406
	 * Get the common "Open to->" action for opening a new Remote System Explorer view,
1407
	 *  scoped to the currently selected object.
1407
	 *  scoped to the currently selected object.
1408
	 */
1408
	 */
1409
	protected SystemOpenExplorerPerspectiveAction getOpenToPerspectiveAction()
1409
	private SystemOpenExplorerPerspectiveAction getOpenToPerspectiveAction()
1410
	{
1410
	{
1411
		if (_openToPerspectiveAction == null)
1411
		if (_openToPerspectiveAction == null)
1412
		{
1412
		{
Lines 1419-1425 Link Here
1419
		return _openToPerspectiveAction;
1419
		return _openToPerspectiveAction;
1420
	}
1420
	}
1421
1421
1422
	protected SystemShowInTableAction getShowInTableAction()
1422
	private SystemShowInTableAction getShowInTableAction()
1423
	{
1423
	{
1424
		if (_showInTableAction == null)
1424
		if (_showInTableAction == null)
1425
		{
1425
		{
(-)UI/org/eclipse/rse/ui/view/ISystemTree.java (+54 lines)
Lines 19-24 Link Here
19
19
20
import java.util.List;
20
import java.util.List;
21
21
22
import org.eclipse.jface.viewers.IDoubleClickListener;
23
import org.eclipse.jface.viewers.ISelectionChangedListener;
24
import org.eclipse.jface.viewers.ViewerFilter;
22
import org.eclipse.rse.core.filters.ISystemFilter;
25
import org.eclipse.rse.core.filters.ISystemFilter;
23
import org.eclipse.rse.core.filters.ISystemFilterReference;
26
import org.eclipse.rse.core.filters.ISystemFilterReference;
24
import org.eclipse.rse.core.subsystems.ISubSystem;
27
import org.eclipse.rse.core.subsystems.ISubSystem;
Lines 179-183 Link Here
179
	 */
182
	 */
180
	public List findAllRemoteItemReferences(Object element, Object elementObject, List matches);
183
	public List findAllRemoteItemReferences(Object element, Object elementObject, List matches);
181
	
184
	
185
	/**
186
	 * Sets the auto expand level for the corresponding tree
187
	 * @param level the level to expand
188
	 * @since 3.0
189
	 */
190
	public void setAutoExpandLevel(int level);
191
	
192
	/**
193
	 * Adds a double-click listener
194
	 * @param listener the listener to add
195
	 * @since 3.0
196
	 */
197
	public void addDoubleClickListener(IDoubleClickListener listener);
198
	
199
	/**
200
	 * Checks whether the element is expandable or not
201
	 * @param elementOrTreePath the object to expand
202
	 * @return whether the item is expandable
203
	 * @since 3.0
204
	 */
205
	public boolean isExpandable(Object elementOrTreePath);
206
207
	/**
208
	 * Expands the parent object down to the remote object
209
	 * @param parentObject the parent object
210
	 * @param remoteObject the child object
211
	 * @since 3.0
212
	 */
213
	public void expandTo(Object parentObject, Object remoteObject);
214
	
215
	/**
216
	 * Expand to the object specified by the filter string
217
	 * @param filterString the string represending the object to expand to
218
	 * @since 3.0
219
	 */
220
	public void expandTo(String filterString);
221
	
222
	/**
223
	 * Adds a view filter
224
	 * @param filter the view filter
225
	 * @since 3.0
226
	 */
227
	public void addFilter(ViewerFilter filter);
182
	
228
	
229
230
	/**
231
	 * Adds a selection changed listener
232
	 * @param listener the listener
233
	 * @since 3.0
234
	 */
235
	public void addSelectionChangedListener(ISelectionChangedListener listener);
236
183
}
237
}
(-)UI/org/eclipse/rse/ui/view/SystemTableViewProvider.java (-3 / +2 lines)
Lines 38-44 Link Here
38
import org.eclipse.rse.core.filters.ISystemFilterReference;
38
import org.eclipse.rse.core.filters.ISystemFilterReference;
39
import org.eclipse.rse.core.model.ISystemContainer;
39
import org.eclipse.rse.core.model.ISystemContainer;
40
import org.eclipse.rse.core.subsystems.ISubSystem;
40
import org.eclipse.rse.core.subsystems.ISubSystem;
41
import org.eclipse.rse.internal.ui.view.SystemTableViewColumnManager;
42
import org.eclipse.rse.internal.ui.view.SystemViewPromptableAdapter;
41
import org.eclipse.rse.internal.ui.view.SystemViewPromptableAdapter;
43
import org.eclipse.rse.internal.ui.view.SystemViewRootInputAdapter;
42
import org.eclipse.rse.internal.ui.view.SystemViewRootInputAdapter;
44
import org.eclipse.swt.graphics.Image;
43
import org.eclipse.swt.graphics.Image;
Lines 69-82 Link Here
69
	 * Maps ImageDescriptor->Image.
68
	 * Maps ImageDescriptor->Image.
70
	 */
69
	 */
71
	private Map imageTable = new Hashtable(40);
70
	private Map imageTable = new Hashtable(40);
72
	private SystemTableViewColumnManager _columnManager;
71
	private ISystemTableViewColumnManager _columnManager;
73
	private HashMap cache;
72
	private HashMap cache;
74
	/**
73
	/**
75
	 * Constructor for table view provider where a column manager is present.
74
	 * Constructor for table view provider where a column manager is present.
76
	 * In this case, the columns are customizable by the user.
75
	 * In this case, the columns are customizable by the user.
77
	 * @param columnManager
76
	 * @param columnManager
78
	 */
77
	 */
79
	public SystemTableViewProvider(SystemTableViewColumnManager columnManager)
78
	public SystemTableViewProvider(ISystemTableViewColumnManager columnManager)
80
	{
79
	{
81
		super();
80
		super();
82
		_columnManager= columnManager;
81
		_columnManager= columnManager;
(-)UI/org/eclipse/rse/ui/filters/actions/SystemFilterAbstractFilterPoolAction.java (-2 / +3 lines)
Lines 30-39 Link Here
30
import org.eclipse.rse.core.filters.ISystemFilterReference;
30
import org.eclipse.rse.core.filters.ISystemFilterReference;
31
import org.eclipse.rse.core.filters.ISystemFilterString;
31
import org.eclipse.rse.core.filters.ISystemFilterString;
32
import org.eclipse.rse.core.filters.ISystemFilterStringReference;
32
import org.eclipse.rse.core.filters.ISystemFilterStringReference;
33
import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogInputs;
34
import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogInterface;
35
import org.eclipse.rse.ui.actions.SystemBaseDialogAction;
33
import org.eclipse.rse.ui.actions.SystemBaseDialogAction;
36
import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
34
import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
35
import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInputs;
36
import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInterface;
37
import org.eclipse.swt.widgets.Shell;
37
import org.eclipse.swt.widgets.Shell;
38
38
39
39
Lines 466-471 Link Here
466
	/**
466
	/**
467
	 * Where you create the dialog meeting our interface. If you override
467
	 * Where you create the dialog meeting our interface. If you override
468
	 * createDialog, then override this to return null
468
	 * createDialog, then override this to return null
469
	 * @since 3.0
469
	 */
470
	 */
470
	public abstract SystemFilterPoolDialogInterface createFilterPoolDialog(Shell parent);
471
	public abstract SystemFilterPoolDialogInterface createFilterPoolDialog(Shell parent);
471
472
(-)UI/org/eclipse/rse/ui/filters/actions/SystemFilterAbstractFilterPoolWizardAction.java (-2 / +3 lines)
Lines 20-29 Link Here
20
20
21
import org.eclipse.jface.dialogs.Dialog;
21
import org.eclipse.jface.dialogs.Dialog;
22
import org.eclipse.jface.resource.ImageDescriptor;
22
import org.eclipse.jface.resource.ImageDescriptor;
23
import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogInterface;
24
import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterPoolWizardDialog;
23
import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterPoolWizardDialog;
25
import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterPoolWizardInterface;
26
import org.eclipse.rse.ui.ISystemContextMenuConstants;
24
import org.eclipse.rse.ui.ISystemContextMenuConstants;
25
import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInterface;
26
import org.eclipse.rse.ui.filters.dialogs.SystemFilterPoolWizardInterface;
27
import org.eclipse.swt.widgets.Shell;
27
import org.eclipse.swt.widgets.Shell;
28
28
29
29
Lines 82-87 Link Here
82
82
83
	/**
83
	/**
84
	 * Return the wizard so we can customize it prior to showing it.
84
	 * Return the wizard so we can customize it prior to showing it.
85
	 * @since 3.0
85
	 */
86
	 */
86
	public abstract SystemFilterPoolWizardInterface getFilterPoolWizard();
87
	public abstract SystemFilterPoolWizardInterface getFilterPoolWizard();
87
88
(-)UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilters.java (+1 lines)
Lines 41-46 Link Here
41
import org.eclipse.rse.ui.RSEUIPlugin;
41
import org.eclipse.rse.ui.RSEUIPlugin;
42
import org.eclipse.rse.ui.SystemBasePlugin;
42
import org.eclipse.rse.ui.SystemBasePlugin;
43
import org.eclipse.rse.ui.subsystems.ISubSystemConfigurationAdapter;
43
import org.eclipse.rse.ui.subsystems.ISubSystemConfigurationAdapter;
44
import org.eclipse.rse.ui.view.SystemAbstractAPIProvider;
44
45
45
46
46
47
(-)UI/org/eclipse/rse/internal/ui/view/SystemTestFilterStringAPIProviderImpl.java (+1 lines)
Lines 22-27 Link Here
22
import org.eclipse.rse.core.model.ISystemViewInputProvider;
22
import org.eclipse.rse.core.model.ISystemViewInputProvider;
23
import org.eclipse.rse.core.subsystems.ISubSystem;
23
import org.eclipse.rse.core.subsystems.ISubSystem;
24
import org.eclipse.rse.ui.SystemBasePlugin;
24
import org.eclipse.rse.ui.SystemBasePlugin;
25
import org.eclipse.rse.ui.view.SystemAbstractAPIProvider;
25
26
26
27
27
/**
28
/**
(-)UI/org/eclipse/rse/internal/ui/view/SystemViewForm.java (-1 / +24 lines)
Lines 21-26 Link Here
21
import java.util.Vector;
21
import java.util.Vector;
22
22
23
import org.eclipse.jface.action.ToolBarManager;
23
import org.eclipse.jface.action.ToolBarManager;
24
import org.eclipse.jface.viewers.IDoubleClickListener;
24
import org.eclipse.jface.viewers.ISelection;
25
import org.eclipse.jface.viewers.ISelection;
25
import org.eclipse.jface.viewers.ISelectionChangedListener;
26
import org.eclipse.jface.viewers.ISelectionChangedListener;
26
import org.eclipse.jface.viewers.ViewerFilter;
27
import org.eclipse.jface.viewers.ViewerFilter;
Lines 149-155 Link Here
149
	/**
150
	/**
150
	 * Return the system view tree viewer
151
	 * Return the system view tree viewer
151
	 */
152
	 */
152
	public SystemView getSystemView()
153
	public ISystemTree getSystemTree()
153
	{
154
	{
154
		return tree;
155
		return tree;
155
	}
156
	}
Lines 515-518 Link Here
515
			ISystemFilter filter) {
516
			ISystemFilter filter) {
516
		return tree.revealAndExpand(parentSubSystem, filter);
517
		return tree.revealAndExpand(parentSubSystem, filter);
517
	}
518
	}
519
	public void addDoubleClickListener(IDoubleClickListener listener) {
520
		tree.addDoubleClickListener(listener);
521
	}
522
	public void addFilter(ViewerFilter filter) {
523
		tree.addFilter(filter);
524
		
525
	}
526
	public void expandTo(Object parentObject, Object remoteObject) {
527
		tree.expandTo(parentObject, remoteObject);
528
		
529
	}
530
	public void expandTo(String filterString) {
531
		tree.expandTo(filterString);
532
		
533
	}
534
	public boolean isExpandable(Object elementOrTreePath) {
535
		return tree.isExpandable(elementOrTreePath);
536
	}
537
	public void setAutoExpandLevel(int level) {
538
		tree.setAutoExpandLevel(level);
539
	}
540
	
518
}
541
}
(-)UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilterStrings.java (+1 lines)
Lines 30-35 Link Here
30
import org.eclipse.rse.core.subsystems.ISubSystem;
30
import org.eclipse.rse.core.subsystems.ISubSystem;
31
import org.eclipse.rse.ui.ISystemMessages;
31
import org.eclipse.rse.ui.ISystemMessages;
32
import org.eclipse.rse.ui.RSEUIPlugin;
32
import org.eclipse.rse.ui.RSEUIPlugin;
33
import org.eclipse.rse.ui.view.SystemAbstractAPIProvider;
33
34
34
35
35
/**
36
/**
(-)UI/org/eclipse/rse/internal/ui/view/SystemViewAdapterFactory.java (-12 / +1 lines)
Lines 164-179 Link Here
164
		return adapter;
164
		return adapter;
165
	}
165
	}
166
166
167
	/**
167
168
	 * Because we use singletons for our adapters, it is possible to speed up 
169
	 * access to them by simply returning them from here.
170
	 * <p>
171
	 * This method returns the RSE adapter for profile objects
172
	 * @return SystemViewProfileAdapter
173
	 * 
174
	 * @deprecated Call getAdapter(...) directly with a <code>ISystemProfile</code>. instance as adaptable object.
175
	 */
176
	public SystemTeamViewProfileAdapter getProfileAdapter() {
177
		return profileAdapter;
178
	}
179
}
168
}
(-)UI/org/eclipse/rse/internal/ui/view/SystemEmptyListAPIProviderImpl.java (+1 lines)
Lines 18-23 Link Here
18
package org.eclipse.rse.internal.ui.view;
18
package org.eclipse.rse.internal.ui.view;
19
import org.eclipse.rse.core.model.IHost;
19
import org.eclipse.rse.core.model.IHost;
20
import org.eclipse.rse.core.model.ISystemViewInputProvider;
20
import org.eclipse.rse.core.model.ISystemViewInputProvider;
21
import org.eclipse.rse.ui.view.SystemAbstractAPIProvider;
21
22
22
23
23
/**
24
/**
(-)UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java (-8 / +9 lines)
Lines 96-101 Link Here
96
import org.eclipse.rse.ui.messages.ISystemMessageLine;
96
import org.eclipse.rse.ui.messages.ISystemMessageLine;
97
import org.eclipse.rse.ui.model.ISystemShellProvider;
97
import org.eclipse.rse.ui.model.ISystemShellProvider;
98
import org.eclipse.rse.ui.view.IRSEViewPart;
98
import org.eclipse.rse.ui.view.IRSEViewPart;
99
import org.eclipse.rse.ui.view.ISystemTableViewColumnManager;
99
import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
100
import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
100
import org.eclipse.rse.ui.view.SystemTableView;
101
import org.eclipse.rse.ui.view.SystemTableView;
101
import org.eclipse.rse.ui.view.SystemTableViewProvider;
102
import org.eclipse.rse.ui.view.SystemTableViewProvider;
Lines 807-813 Link Here
807
	    class SelectColumnsDialog extends SystemPromptDialog
808
	    class SelectColumnsDialog extends SystemPromptDialog
808
		{
809
		{
809
	        private ISystemViewElementAdapter _adapter;
810
	        private ISystemViewElementAdapter _adapter;
810
	        private SystemTableViewColumnManager _columnManager;
811
	        private ISystemTableViewColumnManager _columnManager;
811
			private IPropertyDescriptor[] _uniqueDescriptors;
812
			private IPropertyDescriptor[] _uniqueDescriptors;
812
			private ArrayList _currentDisplayedDescriptors;
813
			private ArrayList _currentDisplayedDescriptors;
813
			private ArrayList _availableDescriptors;
814
			private ArrayList _availableDescriptors;
Lines 821-827 Link Here
821
			private Button _downButton;
822
			private Button _downButton;
822
			
823
			
823
824
824
			public SelectColumnsDialog(Shell shell, ISystemViewElementAdapter viewAdapter, SystemTableViewColumnManager columnManager)
825
			public SelectColumnsDialog(Shell shell, ISystemViewElementAdapter viewAdapter, ISystemTableViewColumnManager columnManager)
825
			{
826
			{
826
				super(shell, SystemResources.RESID_TABLE_SELECT_COLUMNS_LABEL);
827
				super(shell, SystemResources.RESID_TABLE_SELECT_COLUMNS_LABEL);
827
				setToolTipText(SystemResources.RESID_TABLE_SELECT_COLUMNS_TOOLTIP);
828
				setToolTipText(SystemResources.RESID_TABLE_SELECT_COLUMNS_TOOLTIP);
Lines 1093-1099 Link Here
1093
		}
1094
		}
1094
		public void run()
1095
		public void run()
1095
		{
1096
		{
1096
		    SystemTableViewColumnManager mgr = _viewer.getColumnManager();		    
1097
		    ISystemTableViewColumnManager mgr = _viewer.getColumnManager();		    
1097
		    ISystemViewElementAdapter adapter = _viewer.getAdapterForContents();
1098
		    ISystemViewElementAdapter adapter = _viewer.getAdapterForContents();
1098
		    SelectColumnsDialog dlg = new SelectColumnsDialog(getShell(), adapter, mgr);
1099
		    SelectColumnsDialog dlg = new SelectColumnsDialog(getShell(), adapter, mgr);
1099
		    if (dlg.open() == Window.OK)
1100
		    if (dlg.open() == Window.OK)
Lines 1672-1682 Link Here
1672
		
1673
		
1673
		boolean referToSameObject = false;
1674
		boolean referToSameObject = false;
1674
		if (registry instanceof SystemRegistry)
1675
		if (registry instanceof SystemRegistry)
1675
        {                       
1676
		{			
1676
                String[] oldNames = event.getOldNames();
1677
			String[] oldNames = event.getOldNames();
1677
                String oldName = (oldNames == null)? null : oldNames[0];
1678
			String oldName = (oldNames == null)? null : oldNames[0];
1678
                referToSameObject =((SystemRegistry)registry).isSameObjectByAbsoluteName(input, null, child,oldName); // right now assuming only one resource
1679
			referToSameObject = ((SystemRegistry)registry).isSameObjectByAbsoluteName(input, null, child, oldName); // right now assuming only one resource
1679
        }
1680
		}
1680
		
1681
		
1681
		if (input == child || child instanceof java.util.List || referToSameObject)
1682
		if (input == child || child instanceof java.util.List || referToSameObject)
1682
		{ 
1683
		{ 
(-)UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForSubSystems.java (+1 lines)
Lines 18-23 Link Here
18
package org.eclipse.rse.internal.ui.view;
18
package org.eclipse.rse.internal.ui.view;
19
import org.eclipse.rse.core.model.IHost;
19
import org.eclipse.rse.core.model.IHost;
20
import org.eclipse.rse.core.subsystems.ISubSystem;
20
import org.eclipse.rse.core.subsystems.ISubSystem;
21
import org.eclipse.rse.ui.view.SystemAbstractAPIProvider;
21
22
22
23
23
/**
24
/**
(-)UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilterPools.java (+1 lines)
Lines 20-25 Link Here
20
import org.eclipse.rse.core.filters.ISystemFilterPoolReference;
20
import org.eclipse.rse.core.filters.ISystemFilterPoolReference;
21
import org.eclipse.rse.core.model.IHost;
21
import org.eclipse.rse.core.model.IHost;
22
import org.eclipse.rse.core.subsystems.ISubSystem;
22
import org.eclipse.rse.core.subsystems.ISubSystem;
23
import org.eclipse.rse.ui.view.SystemAbstractAPIProvider;
23
24
24
25
25
/**
26
/**
(-)UI/org/eclipse/rse/internal/ui/view/SystemResourceSelectionInputProvider.java (-142 lines)
Removed Link Here
1
/********************************************************************************
2
 * Copyright (c) 2004, 2007 IBM Corporation and others. All rights reserved.
3
 * This program and the accompanying materials are made available under the terms
4
 * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
5
 * available at http://www.eclipse.org/legal/epl-v10.html
6
 * 
7
 * Initial Contributors:
8
 * The following IBM employees contributed to the Remote System Explorer
9
 * component that contains this file: David McKnight, Kushal Munir, 
10
 * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
11
 * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
12
 * 
13
 * Contributors:
14
 * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
15
 * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
16
 * Martin Oberhuber (Wind River) - [202866] Fix exceptions in RSE browse dialog when SystemRegistry is not yet fully initialized
17
 ********************************************************************************/
18
19
package org.eclipse.rse.internal.ui.view;
20
import org.eclipse.rse.core.IRSESystemType;
21
import org.eclipse.rse.core.RSECorePlugin;
22
import org.eclipse.rse.core.model.IHost;
23
import org.eclipse.rse.core.model.ISystemRegistry;
24
import org.eclipse.rse.core.subsystems.ISubSystem;
25
26
27
public abstract class SystemResourceSelectionInputProvider extends SystemAbstractAPIProvider
28
{		
29
	private IHost _connection = null;
30
	private boolean _onlyConnection = false;
31
	private boolean _allowNew = true;
32
	private IRSESystemType[] _systemTypes;
33
	private String _category = null;
34
	
35
	public SystemResourceSelectionInputProvider(IHost connection)
36
	{
37
		_connection = connection;
38
	}
39
	
40
	public SystemResourceSelectionInputProvider()
41
	{
42
		// choose random host
43
		ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
44
		IHost[] hosts = registry.getHosts();
45
		if (hosts != null && hosts.length>0) {
46
			_connection = hosts[0];
47
		}
48
	}
49
	
50
	public IHost getSystemConnection()
51
	{
52
		return _connection;
53
	}
54
	
55
	public boolean allowMultipleConnections()
56
	{
57
		return !_onlyConnection;
58
	}
59
	
60
	public void setAllowNewConnection(boolean flag)
61
	{
62
		_allowNew = flag;
63
	}
64
	
65
	public boolean allowNewConnection()
66
	{
67
		return _allowNew;
68
	}
69
	
70
	public void setSystemConnection(IHost connection, boolean onlyConnection)
71
	{
72
		_connection = connection;
73
		_onlyConnection = onlyConnection;
74
	}
75
	
76
	public IRSESystemType[] getSystemTypes()
77
	{
78
		return _systemTypes;
79
	}
80
	
81
	public void setSystemTypes(IRSESystemType[] types)
82
	{
83
		_systemTypes = types;
84
	}
85
	
86
	public Object[] getSystemViewRoots()
87
	{
88
		if (_connection == null)
89
		{
90
			ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
91
			IHost[] hosts = registry.getHosts();
92
			if (hosts!=null && hosts.length!=0) {
93
				_connection = registry.getHosts()[0];
94
			}
95
		}
96
		return getConnectionChildren(_connection);
97
	}
98
99
	public boolean hasSystemViewRoots()
100
	{
101
		return false;
102
	}
103
104
	public Object[] getConnectionChildren(IHost selectedConnection)
105
	{
106
		if (selectedConnection != null)
107
		{
108
			ISubSystem ss = getSubSystem(selectedConnection);
109
			if (ss!=null) {
110
				return ss.getChildren();
111
			}
112
		}
113
		return new Object[0];
114
	}
115
116
	public boolean hasConnectionChildren(IHost selectedConnection)
117
	{
118
		if (selectedConnection != null)
119
		{
120
			ISubSystem ss = getSubSystem(selectedConnection);
121
			if (ss!=null) {
122
				return ss.hasChildren();
123
			}
124
		}
125
		return false;
126
	}
127
	
128
	protected abstract ISubSystem getSubSystem(IHost selectedConnection);
129
	
130
	
131
	public void setCategory(String category)
132
	{
133
		_category = category;
134
	}
135
	
136
	public String getCategory()
137
	{
138
		return _category;
139
	}
140
	
141
	
142
}
(-)UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForConnections.java (+1 lines)
Lines 17-22 Link Here
17
package org.eclipse.rse.internal.ui.view;
17
package org.eclipse.rse.internal.ui.view;
18
import org.eclipse.core.runtime.NullProgressMonitor;
18
import org.eclipse.core.runtime.NullProgressMonitor;
19
import org.eclipse.rse.core.model.IHost;
19
import org.eclipse.rse.core.model.IHost;
20
import org.eclipse.rse.ui.view.SystemAbstractAPIProvider;
20
21
21
/**
22
/**
22
 * This class is a provider of root nodes to the remote systems tree viewer part.
23
 * This class is a provider of root nodes to the remote systems tree viewer part.
(-)UI/org/eclipse/rse/internal/ui/view/SystemResourceSelectionForm.java (-7 / +9 lines)
Lines 43-50 Link Here
43
import org.eclipse.rse.ui.messages.ISystemMessageLine;
43
import org.eclipse.rse.ui.messages.ISystemMessageLine;
44
import org.eclipse.rse.ui.validators.IValidatorRemoteSelection;
44
import org.eclipse.rse.ui.validators.IValidatorRemoteSelection;
45
import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
45
import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
46
import org.eclipse.rse.ui.view.ISystemTree;
46
import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
47
import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
47
import org.eclipse.rse.ui.view.SystemAdapterHelpers;
48
import org.eclipse.rse.ui.view.SystemAdapterHelpers;
49
import org.eclipse.rse.ui.view.SystemResourceSelectionInputProvider;
48
import org.eclipse.rse.ui.widgets.SystemHostCombo;
50
import org.eclipse.rse.ui.widgets.SystemHostCombo;
49
import org.eclipse.swt.SWT;
51
import org.eclipse.swt.SWT;
50
import org.eclipse.swt.events.SelectionAdapter;
52
import org.eclipse.swt.events.SelectionAdapter;
Lines 69-75 Link Here
69
	private SystemHostCombo _connectionCombo;
71
	private SystemHostCombo _connectionCombo;
70
	private SystemViewForm _systemViewForm;
72
	private SystemViewForm _systemViewForm;
71
	private Composite _propertySheetContainer;
73
	private Composite _propertySheetContainer;
72
    protected SystemPropertySheetForm _ps;
74
    private SystemPropertySheetForm _ps;
73
	
75
	
74
	private Text _pathText;
76
	private Text _pathText;
75
	private boolean _isValid;
77
	private boolean _isValid;
Lines 139-147 Link Here
139
     * Return the embedded System Tree object.
141
     * Return the embedded System Tree object.
140
     * Will be null until createControls is called.
142
     * Will be null until createControls is called.
141
     */
143
     */
142
    public SystemViewForm getSystemViewForm()
144
    public ISystemTree getSystemTree()
143
    {
145
    {
144
    	return _systemViewForm;
146
    	return _systemViewForm.getSystemTree();
145
    }
147
    }
146
    
148
    
147
	public void createControls(Composite parent)
149
	public void createControls(Composite parent)
Lines 243-249 Link Here
243
	{
245
	{
244
		if (filter != null)
246
		if (filter != null)
245
		{
247
		{
246
			_systemViewForm.getSystemView().addFilter(filter);
248
			_systemViewForm.getSystemTree().addFilter(filter);
247
		}
249
		}
248
	}
250
	}
249
    
251
    
Lines 340-350 Link Here
340
			}
342
			}
341
			List filterRefs = registry.findFilterReferencesFor(selection, ss, false);
343
			List filterRefs = registry.findFilterReferencesFor(selection, ss, false);
342
			
344
			
343
			SystemView systemView = _systemViewForm.getSystemView();
345
			ISystemTree systemTree = _systemViewForm.getSystemTree();
344
			if (filterRefs.size() > 0)
346
			if (filterRefs.size() > 0)
345
			{
347
			{
346
				ISystemFilterReference ref = (ISystemFilterReference)filterRefs.get(0);
348
				ISystemFilterReference ref = (ISystemFilterReference)filterRefs.get(0);
347
				systemView.expandTo(ref, selection);
349
				systemTree.expandTo(ref, selection);
348
350
349
				return true;
351
				return true;
350
			}
352
			}
Lines 352-358 Link Here
352
			{
354
			{
353
				if (setPreSelection(parent))
355
				if (setPreSelection(parent))
354
				{
356
				{
355
					systemView.expandTo(parent, selection);
357
					systemTree.expandTo(parent, selection);
356
					return true;
358
					return true;
357
				}				
359
				}				
358
			}
360
			}
(-)UI/org/eclipse/rse/internal/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java (-3 / +4 lines)
Lines 29-42 Link Here
29
import org.eclipse.rse.core.filters.ISystemFilterStringReference;
29
import org.eclipse.rse.core.filters.ISystemFilterStringReference;
30
import org.eclipse.rse.core.filters.SystemFilterUtil;
30
import org.eclipse.rse.core.filters.SystemFilterUtil;
31
import org.eclipse.rse.core.model.IHost;
31
import org.eclipse.rse.core.model.IHost;
32
import org.eclipse.rse.core.model.ISystemViewInputProvider;
33
import org.eclipse.rse.core.subsystems.ISubSystem;
32
import org.eclipse.rse.core.subsystems.ISubSystem;
34
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
33
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
35
import org.eclipse.rse.ui.SystemBasePlugin;
34
import org.eclipse.rse.ui.SystemBasePlugin;
36
import org.eclipse.rse.ui.internal.model.SystemNewConnectionPromptObject;
35
import org.eclipse.rse.ui.internal.model.SystemNewConnectionPromptObject;
37
import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
36
import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
37
import org.eclipse.rse.ui.view.ISystemSelectRemoteObjectAPIProvider;
38
import org.eclipse.rse.ui.view.ISystemSelectRemoteObjectAPIProviderCaller;
38
import org.eclipse.rse.ui.view.ISystemSelectRemoteObjectAPIProviderCaller;
39
import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
39
import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
40
import org.eclipse.rse.ui.view.SystemAbstractAPIProvider;
40
import org.eclipse.rse.ui.view.SystemAdapterHelpers;
41
import org.eclipse.rse.ui.view.SystemAdapterHelpers;
41
import org.eclipse.swt.widgets.Shell;
42
import org.eclipse.swt.widgets.Shell;
42
43
Lines 53-60 Link Here
53
 */
54
 */
54
public class SystemSelectRemoteObjectAPIProviderImpl 
55
public class SystemSelectRemoteObjectAPIProviderImpl 
55
       extends SystemAbstractAPIProvider
56
       extends SystemAbstractAPIProvider
56
       implements ISystemViewInputProvider
57
       implements ISystemSelectRemoteObjectAPIProvider
57
{
58
 {
58
59
59
60
60
	protected ISubSystem subsystem = null;
61
	protected ISubSystem subsystem = null;
(-)UI/org/eclipse/rse/internal/ui/view/SystemTableViewColumnManager.java (-1 / +2 lines)
Lines 20-30 Link Here
20
20
21
import org.eclipse.jface.viewers.Viewer;
21
import org.eclipse.jface.viewers.Viewer;
22
import org.eclipse.rse.ui.SystemPreferencesManager;
22
import org.eclipse.rse.ui.SystemPreferencesManager;
23
import org.eclipse.rse.ui.view.ISystemTableViewColumnManager;
23
import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
24
import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
24
import org.eclipse.ui.views.properties.IPropertyDescriptor;
25
import org.eclipse.ui.views.properties.IPropertyDescriptor;
25
26
26
27
27
public class SystemTableViewColumnManager
28
public class SystemTableViewColumnManager implements ISystemTableViewColumnManager
28
{
29
{
29
    private Viewer _viewer;
30
    private Viewer _viewer;
30
	protected HashMap _descriptorCache;
31
	protected HashMap _descriptorCache;
(-)UI/org/eclipse/rse/internal/ui/view/SystemViewDataDropAdapter.java (-1 / +1 lines)
Lines 114-120 Link Here
114
		for (int i = 0;i < tokens.length; i++)
114
		for (int i = 0;i < tokens.length; i++)
115
		{
115
		{
116
			String srcStr = tokens[i];
116
			String srcStr = tokens[i];
117
			if (srcStr.equals("org.eclipse.ui.navigator.ProjectExplorer"))
117
			if (srcStr.equals("org.eclipse.ui.navigator.ProjectExplorer")) //$NON-NLS-1$
118
			{
118
			{
119
				return true;
119
				return true;
120
			}
120
			}
(-)UI/org/eclipse/rse/internal/ui/view/SystemAbstractAPIProvider.java (-213 lines)
Removed Link Here
1
/********************************************************************************
2
 * Copyright (c) 2002, 2008 IBM Corporation and others. All rights reserved.
3
 * This program and the accompanying materials are made available under the terms
4
 * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
5
 * available at http://www.eclipse.org/legal/epl-v10.html
6
 * 
7
 * Initial Contributors:
8
 * The following IBM employees contributed to the Remote System Explorer
9
 * component that contains this file: David McKnight, Kushal Munir, 
10
 * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
11
 * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
12
 * 
13
 * Contributors:
14
 * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
15
 * Tobias Schwarz   (Wind River) - [173267] "empty list" should not be displayed 
16
 * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core
17
 * Martin Oberhuber (Wind River) - [218524][api] Remove deprecated ISystemViewInputProvider#getShell()
18
 ********************************************************************************/
19
20
package org.eclipse.rse.internal.ui.view;
21
import org.eclipse.core.runtime.Platform;
22
import org.eclipse.core.runtime.Preferences;
23
import org.eclipse.jface.viewers.Viewer;
24
import org.eclipse.rse.core.RSECorePlugin;
25
import org.eclipse.rse.core.model.ISystemMessageObject;
26
import org.eclipse.rse.core.model.ISystemRegistry;
27
import org.eclipse.rse.core.model.ISystemViewInputProvider;
28
import org.eclipse.rse.core.model.SystemMessageObject;
29
import org.eclipse.rse.ui.ISystemMessages;
30
import org.eclipse.rse.ui.ISystemPreferencesConstants;
31
import org.eclipse.rse.ui.RSEUIPlugin;
32
import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
33
import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
34
import org.eclipse.rse.ui.view.SystemAdapterHelpers;
35
import org.eclipse.swt.widgets.Shell;
36
37
38
39
/**
40
 * This is a base class that a provider of root nodes to the remote systems tree viewer part can
41
 * use as a parent class.
42
 */
43
public abstract class SystemAbstractAPIProvider 
44
       implements ISystemViewInputProvider
45
{
46
	protected Viewer viewer;
47
	protected ISystemRegistry sr;
48
	
49
	protected Object[] emptyList = new Object[0];
50
	protected Object[] msgList   = new Object[1];
51
	/**
52
	 * @deprecated Use {@link #checkForEmptyList(Object[], Object, boolean)} instead.
53
	 */
54
	protected SystemMessageObject nullObject     = null;
55
	protected SystemMessageObject canceledObject = null;	
56
	protected SystemMessageObject errorObject    = null;	
57
	
58
	private Preferences fPrefStore = null;
59
	
60
	/**
61
	 * Constructor 
62
	 */
63
	public SystemAbstractAPIProvider()
64
	{
65
		super();
66
		sr = RSECorePlugin.getTheSystemRegistry();
67
	}
68
	
69
    /**
70
	 * This is the method required by the IAdaptable interface.
71
	 * Given an adapter class type, return an object castable to the type, or
72
	 *  null if this is not possible.
73
	 */
74
    public Object getAdapter(Class adapterType)
75
    {
76
   	    return Platform.getAdapterManager().getAdapter(this, adapterType);	
77
    }           
78
79
    /*
80
     * (non-Javadoc)
81
     * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#setViewer(java.lang.Object)
82
     */
83
    public void setViewer(Object viewer)
84
    {
85
    	this.viewer = (Viewer)viewer;
86
    }
87
    
88
    /*
89
     * (non-Javadoc)
90
     * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#getViewer()
91
     */
92
    public Object getViewer()
93
    {
94
    	return viewer;
95
    }
96
97
    protected final void initMsgObjects()
98
 	{
99
 		nullObject     = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_EMPTY),ISystemMessageObject.MSGTYPE_EMPTY, null);
100
 		canceledObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_LIST_CANCELED),ISystemMessageObject.MSGTYPE_CANCEL, null);
101
 		errorObject    = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_FAILED),ISystemMessageObject.MSGTYPE_ERROR, null);
102
 	}
103
104
    /**
105
     * <i>Callable by subclasses. Do not override</i><br>
106
     * In getChildren, return <samp>checkForEmptyList(children, parent, true/false)<.samp>
107
     * versus your array directly. This method checks for a null array which is
108
     * not allowed and replaces it with an empty array. 
109
     * If true is passed then it returns the "Empty list" message object if the array is null or empty
110
     * 
111
     * @param children The list of children.
112
     * @param parent The parent for the children.
113
     * @param returnNullMsg <code>true</code> if an "Empty List" message should be returned.
114
     * @return The list of children, a list with the "Empty List" message object or an empty list.
115
     */
116
    protected Object[] checkForEmptyList(Object[] children, Object parent, boolean returnNullMsg) {
117
    	if ((children == null) || (children.length == 0)) {
118
    		if (fPrefStore == null) {
119
    			fPrefStore = RSEUIPlugin.getDefault().getPluginPreferences();
120
    		}
121
    		if (!returnNullMsg
122
    				|| (fPrefStore != null && !fPrefStore
123
    						.getBoolean(ISystemPreferencesConstants.SHOW_EMPTY_LISTS))) {
124
    			return emptyList;
125
    		} else {
126
    			return new Object[] {
127
    				new SystemMessageObject(
128
    					RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_EMPTY),
129
    					ISystemMessageObject.MSGTYPE_EMPTY, 
130
    					parent)};
131
    		}
132
    	}
133
    	return children;
134
    }
135
    
136
    /**
137
     * In getChildren, return checkForNull(children, true/false) vs your array directly.
138
     * This method checks for a null array which not allow and replaces it with an empty array.
139
     * If true is passed then it returns the "Empty list" message object if the array is null or empty
140
     * 
141
     * @deprecated Use {@link #checkForEmptyList(Object[], Object, boolean)} instead.
142
     */
143
    protected Object[] checkForNull(Object[] children, boolean returnNullMsg)
144
    {
145
	   if ((children == null) || (children.length==0))
146
	   {
147
	   	 if (!returnNullMsg)
148
           return emptyList;
149
         else
150
         {
151
	 	   if (nullObject == null)
152
	 	     initMsgObjects();
153
	 	   msgList[0] = nullObject;
154
	 	   return msgList;
155
         }
156
	   }
157
       else
158
         return children;
159
    }
160
161
    /**
162
     * Return the "Operation cancelled by user" msg as an object array so can be used to answer getChildren()
163
     */
164
    protected Object[] getCancelledMessageObject()
165
    {    	
166
		 if (canceledObject == null)
167
		   initMsgObjects();
168
		 msgList[0] = canceledObject;
169
		 return msgList;
170
    }    
171
172
    /**
173
     * Return the "Operation failed" msg as an object array so can be used to answer getChildren()
174
     */
175
    protected Object[] getFailedMessageObject()
176
    {    	
177
		 if (errorObject == null)
178
		   initMsgObjects();
179
		 msgList[0] = errorObject;
180
		 return msgList;
181
    }    
182
183
	/**
184
	 * Return true if we are listing connections or not, so we know whether we are interested in 
185
	 *  connection-add events
186
	 */
187
	public boolean showingConnections()
188
	{
189
		return false;
190
	}
191
192
	// ------------------
193
	// HELPER METHODS...
194
	// ------------------	
195
    /**
196
     * Returns the implementation of ISystemViewElement for the given
197
     * object.  Returns null if the adapter is not defined or the
198
     * object is not adaptable.
199
     */
200
    protected ISystemViewElementAdapter getViewAdapter(Object o) 
201
    {
202
    	return SystemAdapterHelpers.getViewAdapter(o);
203
    }
204
    
205
    /**
206
     * Returns the implementation of ISystemRemoteElement for the given
207
     * object.  Returns null if this object does not adaptable to this.
208
     */
209
    protected ISystemRemoteElementAdapter getRemoteAdapter(Object o) 
210
    {
211
    	return SystemAdapterHelpers.getRemoteAdapter(o);
212
    }
213
}
(-)UI/org/eclipse/rse/internal/ui/filters/SystemFilterPoolDialogOutputs.java (-37 lines)
Removed Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2002, 2007 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
6
 * http://www.eclipse.org/legal/epl-v10.html
7
 *
8
 * Initial Contributors:
9
 * The following IBM employees contributed to the Remote System Explorer
10
 * component that contains this file: David McKnight, Kushal Munir, 
11
 * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
12
 * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
13
 * 
14
 * Contributors:
15
 * {Name} (company) - description of contribution.
16
 *******************************************************************************/
17
18
package org.eclipse.rse.internal.ui.filters;
19
//import org.eclipse.rse.core.*;
20
import org.eclipse.rse.core.filters.ISystemFilterPool;
21
import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
22
23
24
25
/**
26
 * A class capturing the attributes commonly returned by dialogs that
27
 * work with filter pools.
28
 */
29
public class SystemFilterPoolDialogOutputs 
30
{
31
32
33
	public String filterPoolName;
34
	public String filterPoolManagerName;	
35
    public SystemSimpleContentElement filterPoolTreeRoot;	
36
    public ISystemFilterPool newPool;
37
}
(-)UI/org/eclipse/rse/internal/ui/filters/SystemFilterPoolDialogInterface.java (-41 lines)
Removed Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2002, 2007 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
6
 * http://www.eclipse.org/legal/epl-v10.html
7
 *
8
 * Initial Contributors:
9
 * The following IBM employees contributed to the Remote System Explorer
10
 * component that contains this file: David McKnight, Kushal Munir, 
11
 * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
12
 * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
13
 * 
14
 * Contributors:
15
 * {Name} (company) - description of contribution.
16
 *******************************************************************************/
17
18
package org.eclipse.rse.internal.ui.filters;
19
import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction;
20
21
22
/**
23
 * Common interface for dialogs or wizards that work with filter pools.
24
 */
25
public interface SystemFilterPoolDialogInterface 
26
{
27
28
29
	/**
30
	 * Allow base action to pass instance of itself for callback to get info
31
	 */
32
    public void setFilterPoolDialogActionCaller(SystemFilterAbstractFilterPoolAction caller);
33
    /**
34
     * Return an object containing user-specified information pertinent to filter pool actions
35
     */
36
    public SystemFilterPoolDialogOutputs getFilterPoolDialogOutputs();    
37
    /**
38
     * Set the help context id for this wizard
39
     */
40
    public void setHelpContextId(String id);
41
}
(-)UI/org/eclipse/rse/internal/ui/filters/SystemFilterPoolDialogInputs.java (-46 lines)
Removed Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2002, 2007 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
6
 * http://www.eclipse.org/legal/epl-v10.html
7
 *
8
 * Initial Contributors:
9
 * The following IBM employees contributed to the Remote System Explorer
10
 * component that contains this file: David McKnight, Kushal Munir, 
11
 * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
12
 * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
13
 * 
14
 * Contributors:
15
 * {Name} (company) - description of contribution.
16
 *******************************************************************************/
17
18
package org.eclipse.rse.internal.ui.filters;
19
//import org.eclipse.rse.core.*;
20
import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
21
import org.eclipse.rse.core.filters.ISystemFilterPoolManagerProvider;
22
import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager;
23
import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
24
import org.eclipse.rse.ui.filters.dialogs.SystemFilterDialogInputs;
25
26
27
28
/**
29
 * A class capturing the attributes commonly needed by dialogs that
30
 * work with filter pools.
31
 */
32
public class SystemFilterPoolDialogInputs extends SystemFilterDialogInputs
33
{
34
35
36
    public ISystemFilterPoolManagerProvider poolManagerProvider = null;
37
	public ISystemFilterPoolManager[] poolManagers = null;
38
	public ISystemFilterPoolReferenceManager refManager = null;
39
	public int mgrSelection = 0;
40
	public String poolNamePrompt;	
41
	public String poolNameTip;	
42
	public String poolMgrNamePrompt;
43
	public String poolMgrNameTip;	
44
	
45
    public SystemSimpleContentElement filterPoolTreeRoot;
46
}
(-)UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizardDefaultMainPage.java (-1 / +1 lines)
Lines 19-27 Link Here
19
import org.eclipse.jface.wizard.Wizard;
19
import org.eclipse.jface.wizard.Wizard;
20
import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
20
import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
21
import org.eclipse.rse.internal.ui.SystemResources;
21
import org.eclipse.rse.internal.ui.SystemResources;
22
import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogOutputs;
23
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
22
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
24
import org.eclipse.rse.ui.SystemWidgetHelpers;
23
import org.eclipse.rse.ui.SystemWidgetHelpers;
24
import org.eclipse.rse.ui.filters.SystemFilterPoolDialogOutputs;
25
import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction;
25
import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction;
26
import org.eclipse.rse.ui.validators.ISystemValidator;
26
import org.eclipse.rse.ui.validators.ISystemValidator;
27
import org.eclipse.rse.ui.validators.ValidatorFilterPoolName;
27
import org.eclipse.rse.ui.validators.ValidatorFilterPoolName;
(-)UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizardMainPageInterface.java (-1 / +1 lines)
Lines 18-24 Link Here
18
package org.eclipse.rse.internal.ui.filters.dialogs;
18
package org.eclipse.rse.internal.ui.filters.dialogs;
19
19
20
import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
20
import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
21
import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogOutputs;
21
import org.eclipse.rse.ui.filters.SystemFilterPoolDialogOutputs;
22
import org.eclipse.rse.ui.validators.ISystemValidator;
22
import org.eclipse.rse.ui.validators.ISystemValidator;
23
import org.eclipse.rse.ui.wizards.ISystemWizardPage;
23
import org.eclipse.rse.ui.wizards.ISystemWizardPage;
24
24
(-)UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterWorkWithFilterPoolsDialog.java (-2 / +2 lines)
Lines 43-50 Link Here
43
import org.eclipse.rse.internal.ui.actions.SystemFilterMoveFilterPoolAction;
43
import org.eclipse.rse.internal.ui.actions.SystemFilterMoveFilterPoolAction;
44
import org.eclipse.rse.internal.ui.actions.SystemFilterNewFilterPoolAction;
44
import org.eclipse.rse.internal.ui.actions.SystemFilterNewFilterPoolAction;
45
import org.eclipse.rse.internal.ui.actions.SystemFilterWorkWithFilterPoolsRefreshAllAction;
45
import org.eclipse.rse.internal.ui.actions.SystemFilterWorkWithFilterPoolsRefreshAllAction;
46
import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogInterface;
47
import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogOutputs;
48
import org.eclipse.rse.internal.ui.filters.SystemFilterPoolManagerUIProvider;
46
import org.eclipse.rse.internal.ui.filters.SystemFilterPoolManagerUIProvider;
49
import org.eclipse.rse.internal.ui.filters.SystemFilterWorkWithFilterPoolsTreeViewer;
47
import org.eclipse.rse.internal.ui.filters.SystemFilterWorkWithFilterPoolsTreeViewer;
50
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
48
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
Lines 58-63 Link Here
58
import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
56
import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
59
import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
57
import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
60
import org.eclipse.rse.ui.dialogs.SystemSimpleContentProvider;
58
import org.eclipse.rse.ui.dialogs.SystemSimpleContentProvider;
59
import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInterface;
60
import org.eclipse.rse.ui.filters.SystemFilterPoolDialogOutputs;
61
import org.eclipse.rse.ui.filters.SystemFilterUIHelpers;
61
import org.eclipse.rse.ui.filters.SystemFilterUIHelpers;
62
import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction;
62
import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction;
63
import org.eclipse.rse.ui.messages.ISystemMessageLine;
63
import org.eclipse.rse.ui.messages.ISystemMessageLine;
(-)UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizard.java (-1 / +2 lines)
Lines 21-32 Link Here
21
import org.eclipse.rse.core.filters.ISystemFilterPool;
21
import org.eclipse.rse.core.filters.ISystemFilterPool;
22
import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
22
import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
23
import org.eclipse.rse.internal.ui.SystemResources;
23
import org.eclipse.rse.internal.ui.SystemResources;
24
import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogOutputs;
25
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
24
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
26
import org.eclipse.rse.ui.ISystemIconConstants;
25
import org.eclipse.rse.ui.ISystemIconConstants;
27
import org.eclipse.rse.ui.ISystemMessages;
26
import org.eclipse.rse.ui.ISystemMessages;
28
import org.eclipse.rse.ui.RSEUIPlugin;
27
import org.eclipse.rse.ui.RSEUIPlugin;
28
import org.eclipse.rse.ui.filters.SystemFilterPoolDialogOutputs;
29
import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction;
29
import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction;
30
import org.eclipse.rse.ui.filters.dialogs.SystemFilterPoolWizardInterface;
30
import org.eclipse.rse.ui.messages.SystemMessageDialog;
31
import org.eclipse.rse.ui.messages.SystemMessageDialog;
31
import org.eclipse.rse.ui.validators.ValidatorFolderName;
32
import org.eclipse.rse.ui.validators.ValidatorFolderName;
32
import org.eclipse.rse.ui.wizards.AbstractSystemWizard;
33
import org.eclipse.rse.ui.wizards.AbstractSystemWizard;
(-)UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterPoolWizardDialog.java (-2 / +3 lines)
Lines 16-25 Link Here
16
 *******************************************************************************/
16
 *******************************************************************************/
17
17
18
package org.eclipse.rse.internal.ui.filters.dialogs;
18
package org.eclipse.rse.internal.ui.filters.dialogs;
19
import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogInterface;
20
import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogOutputs;
21
import org.eclipse.rse.ui.dialogs.SystemWizardDialog;
19
import org.eclipse.rse.ui.dialogs.SystemWizardDialog;
20
import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInterface;
21
import org.eclipse.rse.ui.filters.SystemFilterPoolDialogOutputs;
22
import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction;
22
import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction;
23
import org.eclipse.rse.ui.filters.dialogs.SystemFilterPoolWizardInterface;
23
import org.eclipse.swt.widgets.Shell;
24
import org.eclipse.swt.widgets.Shell;
24
25
25
26
(-)UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterPoolWizardInterface.java (-28 lines)
Removed Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2002, 2007 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
6
 * http://www.eclipse.org/legal/epl-v10.html
7
 *
8
 * Initial Contributors:
9
 * The following IBM employees contributed to the Remote System Explorer
10
 * component that contains this file: David McKnight, Kushal Munir, 
11
 * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
12
 * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
13
 * 
14
 * Contributors:
15
 * {Name} (company) - description of contribution.
16
 *******************************************************************************/
17
18
package org.eclipse.rse.internal.ui.filters.dialogs;
19
import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogInterface;
20
import org.eclipse.rse.ui.wizards.ISystemWizard;
21
22
/**
23
 * An interface for filter pool wizards to implement
24
 */
25
public interface SystemFilterPoolWizardInterface 
26
       extends ISystemWizard, SystemFilterPoolDialogInterface
27
{
28
}
(-)UI/org/eclipse/rse/internal/ui/dialogs/SystemTestFilterStringDialog.java (-1 / +1 lines)
Lines 51-57 Link Here
51
 */
51
 */
52
public class SystemTestFilterStringDialog
52
public class SystemTestFilterStringDialog
53
       extends SystemPromptDialog
53
       extends SystemPromptDialog
54
       implements  ISelectionChangedListener, SelectionListener
54
       implements ISelectionChangedListener, SelectionListener
55
{
55
{
56
	protected ISubSystem subsystem = null;
56
	protected ISubSystem subsystem = null;
57
	protected ISystemRegistry sr = null;
57
	protected ISystemRegistry sr = null;
(-)UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewPart.java (+1 lines)
Lines 715-720 Link Here
715
	 */
715
	 */
716
	private SystemTeamViewProfileAdapter getProfileAdapter(ISystemProfile profile) {
716
	private SystemTeamViewProfileAdapter getProfileAdapter(ISystemProfile profile) {
717
		RSEUIPlugin plugin = RSEUIPlugin.getDefault();
717
		RSEUIPlugin plugin = RSEUIPlugin.getDefault();
718
		
718
		IAdapterFactory factory = plugin.getSystemViewAdapterFactory();
719
		IAdapterFactory factory = plugin.getSystemViewAdapterFactory();
719
		SystemTeamViewProfileAdapter adapter = (SystemTeamViewProfileAdapter) factory.getAdapter(profile, SystemTeamViewProfileAdapter.class);
720
		SystemTeamViewProfileAdapter adapter = (SystemTeamViewProfileAdapter) factory.getAdapter(profile, SystemTeamViewProfileAdapter.class);
720
		return adapter;
721
		return adapter;
(-)UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewPropertySetAdapter.java (-1 / +1 lines)
Lines 242-248 Link Here
242
	public String getMementoHandleKey(Object element)
242
	public String getMementoHandleKey(Object element)
243
	{
243
	{
244
		SystemTeamViewPropertySetNode factory = (SystemTeamViewPropertySetNode)element;	
244
		SystemTeamViewPropertySetNode factory = (SystemTeamViewPropertySetNode)element;	
245
		return  factory.getLabel(); //$NON-NLS-1$  
245
		return  factory.getLabel(); 
246
	}
246
	}
247
247
248
	/**
248
	/**
(-)UI/org/eclipse/rse/internal/ui/actions/SystemFilterWorkWithFilterPoolsAction.java (-1 / +1 lines)
Lines 21-33 Link Here
21
import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
21
import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
22
import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManagerProvider;
22
import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManagerProvider;
23
import org.eclipse.rse.internal.ui.SystemResources;
23
import org.eclipse.rse.internal.ui.SystemResources;
24
import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogInterface;
25
import org.eclipse.rse.internal.ui.filters.SystemFilterPoolManagerUIProvider;
24
import org.eclipse.rse.internal.ui.filters.SystemFilterPoolManagerUIProvider;
26
import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterWorkWithFilterPoolsDialog;
25
import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterWorkWithFilterPoolsDialog;
27
import org.eclipse.rse.ui.ISystemContextMenuConstants;
26
import org.eclipse.rse.ui.ISystemContextMenuConstants;
28
import org.eclipse.rse.ui.ISystemIconConstants;
27
import org.eclipse.rse.ui.ISystemIconConstants;
29
import org.eclipse.rse.ui.RSEUIPlugin;
28
import org.eclipse.rse.ui.RSEUIPlugin;
30
import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
29
import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
30
import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInterface;
31
import org.eclipse.rse.ui.filters.SystemFilterUIHelpers;
31
import org.eclipse.rse.ui.filters.SystemFilterUIHelpers;
32
import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction;
32
import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction;
33
import org.eclipse.rse.ui.validators.ValidatorFilterPoolName;
33
import org.eclipse.rse.ui.validators.ValidatorFilterPoolName;
(-)UI/org/eclipse/rse/internal/ui/actions/SystemResolveFilterStringAction.java (-4 / +1 lines)
Lines 19-25 Link Here
19
import org.eclipse.jface.dialogs.Dialog;
19
import org.eclipse.jface.dialogs.Dialog;
20
import org.eclipse.rse.core.subsystems.ISubSystem;
20
import org.eclipse.rse.core.subsystems.ISubSystem;
21
import org.eclipse.rse.internal.ui.dialogs.SystemResolveFilterStringDialog;
21
import org.eclipse.rse.internal.ui.dialogs.SystemResolveFilterStringDialog;
22
import org.eclipse.rse.ui.actions.SystemTestFilterStringAction;
23
import org.eclipse.swt.widgets.Shell;
22
import org.eclipse.swt.widgets.Shell;
24
23
25
24
Lines 61-69 Link Here
61
	 */
60
	 */
62
	protected Dialog createDialog(Shell shell)
61
	protected Dialog createDialog(Shell shell)
63
	{
62
	{
64
	  dlg = new SystemResolveFilterStringDialog(shell, subsystem, filterString);
63
	  return new SystemResolveFilterStringDialog(shell, subsystem, filterString);
65
66
	  return dlg;
67
	} // end createDialog()
64
	} // end createDialog()
68
	
65
	
69
	/**
66
	/**
(-)UI/org/eclipse/rse/internal/ui/actions/SystemFilterNewFilterPoolAction.java (-2 / +2 lines)
Lines 22-38 Link Here
22
import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager;
22
import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager;
23
import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManagerProvider;
23
import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManagerProvider;
24
import org.eclipse.rse.internal.ui.SystemResources;
24
import org.eclipse.rse.internal.ui.SystemResources;
25
import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogOutputs;
26
import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterNewFilterPoolWizard;
25
import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterNewFilterPoolWizard;
27
import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterPoolWizardDialog;
26
import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterPoolWizardDialog;
28
import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterPoolWizardInterface;
29
import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterWorkWithFilterPoolsDialog;
27
import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterWorkWithFilterPoolsDialog;
30
import org.eclipse.rse.ui.ISystemContextMenuConstants;
28
import org.eclipse.rse.ui.ISystemContextMenuConstants;
31
import org.eclipse.rse.ui.ISystemIconConstants;
29
import org.eclipse.rse.ui.ISystemIconConstants;
32
import org.eclipse.rse.ui.RSEUIPlugin;
30
import org.eclipse.rse.ui.RSEUIPlugin;
33
import org.eclipse.rse.ui.actions.ISystemWizardAction;
31
import org.eclipse.rse.ui.actions.ISystemWizardAction;
34
import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
32
import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
33
import org.eclipse.rse.ui.filters.SystemFilterPoolDialogOutputs;
35
import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolWizardAction;
34
import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolWizardAction;
35
import org.eclipse.rse.ui.filters.dialogs.SystemFilterPoolWizardInterface;
36
import org.eclipse.swt.widgets.Shell;
36
import org.eclipse.swt.widgets.Shell;
37
37
38
38
(-)UI/org/eclipse/rse/internal/ui/actions/SystemFilterSelectFilterPoolsAction.java (-1 / +1 lines)
Lines 24-35 Link Here
24
import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager;
24
import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager;
25
import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManagerProvider;
25
import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManagerProvider;
26
import org.eclipse.rse.internal.ui.SystemResources;
26
import org.eclipse.rse.internal.ui.SystemResources;
27
import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogInterface;
28
import org.eclipse.rse.ui.ISystemContextMenuConstants;
27
import org.eclipse.rse.ui.ISystemContextMenuConstants;
29
import org.eclipse.rse.ui.ISystemIconConstants;
28
import org.eclipse.rse.ui.ISystemIconConstants;
30
import org.eclipse.rse.ui.RSEUIPlugin;
29
import org.eclipse.rse.ui.RSEUIPlugin;
31
import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
30
import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
32
import org.eclipse.rse.ui.dialogs.SystemSimpleSelectDialog;
31
import org.eclipse.rse.ui.dialogs.SystemSimpleSelectDialog;
32
import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInterface;
33
import org.eclipse.rse.ui.filters.SystemFilterUIHelpers;
33
import org.eclipse.rse.ui.filters.SystemFilterUIHelpers;
34
import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction;
34
import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction;
35
import org.eclipse.swt.widgets.Shell;
35
import org.eclipse.swt.widgets.Shell;
(-)subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java (-1 / +2 lines)
Lines 58-63 Link Here
58
import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
58
import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
59
import org.eclipse.rse.core.filters.ISystemFilterPoolReference;
59
import org.eclipse.rse.core.filters.ISystemFilterPoolReference;
60
import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager;
60
import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager;
61
import org.eclipse.rse.core.filters.ISystemFilterPoolWrapperInformation;
61
import org.eclipse.rse.core.filters.ISystemFilterString;
62
import org.eclipse.rse.core.filters.ISystemFilterString;
62
import org.eclipse.rse.core.model.IHost;
63
import org.eclipse.rse.core.model.IHost;
63
import org.eclipse.rse.core.model.ILabeledObject;
64
import org.eclipse.rse.core.model.ILabeledObject;
Lines 1414-1420 Link Here
1414
	 * Overridable entry for child classes to supply their own flavour of ISystemFilterPoolWrapperInformation for
1415
	 * Overridable entry for child classes to supply their own flavour of ISystemFilterPoolWrapperInformation for
1415
	 *  the new filter wizards.
1416
	 *  the new filter wizards.
1416
	 */
1417
	 */
1417
	protected SystemFilterPoolWrapperInformation getNewFilterWizardPoolWrapperInformation()
1418
	protected ISystemFilterPoolWrapperInformation getNewFilterWizardPoolWrapperInformation()
1418
	{
1419
	{
1419
		return new SystemFilterPoolWrapperInformation(SystemResources.RESID_NEWFILTER_PAGE2_PROFILE_LABEL, SystemResources.RESID_NEWFILTER_PAGE2_PROFILE_TOOLTIP, 
1420
		return new SystemFilterPoolWrapperInformation(SystemResources.RESID_NEWFILTER_PAGE2_PROFILE_LABEL, SystemResources.RESID_NEWFILTER_PAGE2_PROFILE_TOOLTIP, 
1420
				SystemResources.RESID_NEWFILTER_PAGE2_PROFILE_VERBIAGE);
1421
				SystemResources.RESID_NEWFILTER_PAGE2_PROFILE_VERBIAGE);
(-)UI/org/eclipse/rse/ui/actions/SystemTestFilterStringAction.java (-103 lines)
Removed Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2002, 2007 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
6
 * http://www.eclipse.org/legal/epl-v10.html
7
 *
8
 * Initial Contributors:
9
 * The following IBM employees contributed to the Remote System Explorer
10
 * component that contains this file: David McKnight, Kushal Munir, 
11
 * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
12
 * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
13
 * 
14
 * Contributors:
15
 * {Name} (company) - description of contribution.
16
 *******************************************************************************/
17
18
package org.eclipse.rse.ui.actions;
19
import org.eclipse.jface.dialogs.Dialog;
20
import org.eclipse.rse.core.subsystems.ISubSystem;
21
import org.eclipse.rse.internal.ui.SystemResources;
22
import org.eclipse.rse.internal.ui.dialogs.SystemTestFilterStringDialog;
23
import org.eclipse.swt.widgets.Shell;
24
25
26
/**
27
 * The action for testing a given filter string by resolving it and showing the resolve results
28
 */
29
public class SystemTestFilterStringAction extends SystemBaseDialogAction 
30
                                 
31
{
32
	
33
	protected ISubSystem subsystem;
34
	protected String filterString;
35
	protected SystemTestFilterStringDialog dlg;
36
37
	
38
	/**
39
	 * Constructor when input subsystem and filter string are known already
40
	 */
41
	public SystemTestFilterStringAction(Shell shell, ISubSystem subsystem, String filterString) 
42
	{
43
		super(SystemResources.ACTION_TESTFILTERSTRING_LABEL, SystemResources.ACTION_TESTFILTERSTRING_TOOLTIP, null,
44
		      shell);
45
		allowOnMultipleSelection(false);
46
		setSubSystem(subsystem);
47
		setFilterString(filterString);
48
	}
49
	/**
50
	 * Constructor when input subsystem and filter string are not known already.
51
	 * @see #setSubSystem(ISubSystem)
52
	 * @see #setFilterString(String)
53
	 */
54
	public SystemTestFilterStringAction(Shell shell) 
55
	{
56
		this(shell, null, null);
57
	}
58
	
59
	/**
60
	 * Set the subsystem within the context of which this filter string is to be tested.
61
	 */
62
	public void setSubSystem(ISubSystem subsystem)
63
	{
64
		this.subsystem = subsystem;
65
	}
66
	
67
	/**
68
	 * Set the filter string to test
69
	 */
70
	public void setFilterString(String filterString)
71
	{
72
		this.filterString = filterString;
73
	}
74
	
75
	/**
76
	 * If you decide to use the supplied run method as is,
77
	 *  then you must override this method to create and return
78
	 *  the dialog that is displayed by the default run method
79
	 *  implementation.
80
	 * <p>
81
	 * If you override run with your own, then
82
	 *  simply implement this to return null as it won't be used.
83
	 * @see #run()
84
	 */
85
	protected Dialog createDialog(Shell shell)
86
	{
87
		//if (dlg == null) // I hoped to reduce memory requirements by re-using but doesn't work. Phil
88
		  dlg = new SystemTestFilterStringDialog(shell, subsystem, filterString);
89
		//else
90
		//{
91
		  //dlg.reset(subsystem, filterString);
92
		//}
93
		return dlg;
94
	}
95
	
96
	/**
97
	 * Required by parent. We just return null.
98
	 */
99
	protected Object getDialogValue(Dialog dlg)
100
	{
101
		return null;
102
	}
103
}
(-)UI/org/eclipse/rse/ui/actions/SystemBaseSubMenuAction.java (-1 / +1 lines)
Lines 42-48 Link Here
42
42
43
{
43
{
44
	
44
	
45
    protected SystemSubMenuManager subMenu = null;
45
    private SystemSubMenuManager subMenu = null;
46
    protected String actionLabel;
46
    protected String actionLabel;
47
    protected String menuID;
47
    protected String menuID;
48
    protected boolean createMenuEachTime = true;
48
    protected boolean createMenuEachTime = true;
(-)UI/org/eclipse/rse/ui/RSEUIPlugin.java (-1 / +2 lines)
Lines 38-43 Link Here
38
import java.net.URL;
38
import java.net.URL;
39
import java.util.Vector;
39
import java.util.Vector;
40
40
41
import org.eclipse.core.runtime.IAdapterFactory;
41
import org.eclipse.core.runtime.IAdapterManager;
42
import org.eclipse.core.runtime.IAdapterManager;
42
import org.eclipse.core.runtime.Platform;
43
import org.eclipse.core.runtime.Platform;
43
import org.eclipse.core.runtime.jobs.Job;
44
import org.eclipse.core.runtime.jobs.Job;
Lines 417-423 Link Here
417
     * For fastpath access to our adapters for non-local objects in our model.
418
     * For fastpath access to our adapters for non-local objects in our model.
418
     * Exploits the knowledge we use singleton adapters.
419
     * Exploits the knowledge we use singleton adapters.
419
     */
420
     */
420
    public SystemViewAdapterFactory getSystemViewAdapterFactory()
421
    public IAdapterFactory getSystemViewAdapterFactory()
421
    {
422
    {
422
    	return svaf;
423
    	return svaf;
423
    }
424
    }
(-)UI/org/eclipse/rse/internal/ui/view/monitor/SystemMonitorViewPart.java (-5 / +5 lines)
Lines 25-31 Link Here
25
25
26
import java.util.ArrayList;
26
import java.util.ArrayList;
27
import java.util.Vector;
27
import java.util.Vector;
28
 
28
29
import org.eclipse.core.runtime.IAdaptable;
29
import org.eclipse.core.runtime.IAdaptable;
30
import org.eclipse.jface.action.IMenuManager;
30
import org.eclipse.jface.action.IMenuManager;
31
import org.eclipse.jface.action.IStatusLineManager;
31
import org.eclipse.jface.action.IStatusLineManager;
Lines 49-55 Link Here
49
import org.eclipse.rse.internal.ui.SystemPropertyResources;
49
import org.eclipse.rse.internal.ui.SystemPropertyResources;
50
import org.eclipse.rse.internal.ui.SystemResources;
50
import org.eclipse.rse.internal.ui.SystemResources;
51
import org.eclipse.rse.internal.ui.view.SystemTableTreeViewProvider;
51
import org.eclipse.rse.internal.ui.view.SystemTableTreeViewProvider;
52
import org.eclipse.rse.internal.ui.view.SystemTableViewColumnManager;
53
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
52
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
54
import org.eclipse.rse.ui.ISystemIconConstants;
53
import org.eclipse.rse.ui.ISystemIconConstants;
55
import org.eclipse.rse.ui.RSEUIPlugin;
54
import org.eclipse.rse.ui.RSEUIPlugin;
Lines 58-63 Link Here
58
import org.eclipse.rse.ui.messages.ISystemMessageLine;
57
import org.eclipse.rse.ui.messages.ISystemMessageLine;
59
import org.eclipse.rse.ui.model.ISystemShellProvider;
58
import org.eclipse.rse.ui.model.ISystemShellProvider;
60
import org.eclipse.rse.ui.view.IRSEViewPart;
59
import org.eclipse.rse.ui.view.IRSEViewPart;
60
import org.eclipse.rse.ui.view.ISystemTableViewColumnManager;
61
import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
61
import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
62
import org.eclipse.rse.ui.view.SystemTableView;
62
import org.eclipse.rse.ui.view.SystemTableView;
63
import org.eclipse.swt.SWT;
63
import org.eclipse.swt.SWT;
Lines 311-317 Link Here
311
	    class SelectColumnsDialog extends SystemPromptDialog
311
	    class SelectColumnsDialog extends SystemPromptDialog
312
		{
312
		{
313
	        private ISystemViewElementAdapter _adapter;
313
	        private ISystemViewElementAdapter _adapter;
314
	        private SystemTableViewColumnManager _columnManager;
314
	        private ISystemTableViewColumnManager _columnManager;
315
			private IPropertyDescriptor[] _uniqueDescriptors;
315
			private IPropertyDescriptor[] _uniqueDescriptors;
316
			private ArrayList _currentDisplayedDescriptors;
316
			private ArrayList _currentDisplayedDescriptors;
317
			private ArrayList _availableDescriptors;
317
			private ArrayList _availableDescriptors;
Lines 325-331 Link Here
325
			private Button _downButton;
325
			private Button _downButton;
326
			
326
			
327
327
328
			public SelectColumnsDialog(Shell shell, ISystemViewElementAdapter viewAdapter, SystemTableViewColumnManager columnManager)
328
			public SelectColumnsDialog(Shell shell, ISystemViewElementAdapter viewAdapter, ISystemTableViewColumnManager columnManager)
329
			{
329
			{
330
				super(shell, SystemResources.RESID_TABLE_SELECT_COLUMNS_LABEL);
330
				super(shell, SystemResources.RESID_TABLE_SELECT_COLUMNS_LABEL);
331
				setToolTipText(SystemResources.RESID_TABLE_SELECT_COLUMNS_TOOLTIP);
331
				setToolTipText(SystemResources.RESID_TABLE_SELECT_COLUMNS_TOOLTIP);
Lines 600-606 Link Here
600
		public void run()
600
		public void run()
601
		{
601
		{
602
			SystemTableView viewer = getViewer();
602
			SystemTableView viewer = getViewer();
603
		    SystemTableViewColumnManager mgr = viewer.getColumnManager();		    
603
		    ISystemTableViewColumnManager mgr = viewer.getColumnManager();		    
604
		    ISystemViewElementAdapter adapter = viewer.getAdapterForContents();
604
		    ISystemViewElementAdapter adapter = viewer.getAdapterForContents();
605
		    SelectColumnsDialog dlg = new SelectColumnsDialog(getShell(), adapter, mgr);
605
		    SelectColumnsDialog dlg = new SelectColumnsDialog(getShell(), adapter, mgr);
606
		    if (dlg.open() == Window.OK)
606
		    if (dlg.open() == Window.OK)
(-)UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizard.java (-4 / +2 lines)
Lines 77-83 Link Here
77
	    extends AbstractSystemWizard 
77
	    extends AbstractSystemWizard 
78
{
78
{
79
	protected SystemNewFilterWizardMainPage mainPage;	
79
	protected SystemNewFilterWizardMainPage mainPage;	
80
	protected SystemNewFilterWizardNamePage namePage;	
80
	private SystemNewFilterWizardNamePage namePage;	
81
	protected SystemNewFilterWizardInfoPage infoPage;	
81
	protected SystemNewFilterWizardInfoPage infoPage;	
82
	protected ISystemFilterContainer         filterContainer;
82
	protected ISystemFilterContainer         filterContainer;
83
	protected ISystemFilterPool              parentPool;
83
	protected ISystemFilterPool              parentPool;
Lines 326-337 Link Here
326
	    return mainPage;
326
	    return mainPage;
327
	}
327
	}
328
	/**
328
	/**
329
	 * Extendable point for child classes. You don't need to override typically though.
330
	 * <p>
331
	 * By default, this page uses the wizard page title as set in setWizardPageTitle(...) or the constructor.
329
	 * By default, this page uses the wizard page title as set in setWizardPageTitle(...) or the constructor.
332
	 * @return the wizard page prompting for the filter name and parent filter pool
330
	 * @return the wizard page prompting for the filter name and parent filter pool
333
	 */
331
	 */
334
	protected SystemNewFilterWizardNamePage createNamePage()
332
	private SystemNewFilterWizardNamePage createNamePage()
335
	{
333
	{
336
		namePage = new SystemNewFilterWizardNamePage(this, parentPool, configurator);
334
		namePage = new SystemNewFilterWizardNamePage(this, parentPool, configurator);
337
	    return namePage;
335
	    return namePage;
(-)UI/org/eclipse/rse/ui/dialogs/SystemSelectAnythingDialog.java (-3 / +3 lines)
Lines 48-57 Link Here
48
	{
48
	{
49
		
49
		
50
		_view = new SystemViewForm(getShell(), parent, SWT.NONE, getInputProvider(), true, this); 
50
		_view = new SystemViewForm(getShell(), parent, SWT.NONE, getInputProvider(), true, this); 
51
		_view.getSystemView().addSelectionChangedListener(this);	
51
		_view.getSystemTree().addSelectionChangedListener(this);	
52
		
52
		
53
		if (_filter != null){
53
		if (_filter != null){
54
			_view.getSystemView().addFilter(_filter);
54
			_view.getSystemTree().addFilter(_filter);
55
		}
55
		}
56
		
56
		
57
		return _view.getTreeControl();
57
		return _view.getTreeControl();
Lines 104-110 Link Here
104
		_filter = filter;
104
		_filter = filter;
105
		if (_view != null)
105
		if (_view != null)
106
		{
106
		{
107
			_view.getSystemView().addFilter(filter);
107
			_view.getSystemTree().addFilter(filter);
108
		}
108
		}
109
109
110
	}
110
	}
(-)UI/org/eclipse/rse/ui/dialogs/SystemRemoteResourceDialog.java (-2 / +21 lines)
Lines 23-32 Link Here
23
import org.eclipse.rse.core.IRSESystemType;
23
import org.eclipse.rse.core.IRSESystemType;
24
import org.eclipse.rse.core.model.IHost;
24
import org.eclipse.rse.core.model.IHost;
25
import org.eclipse.rse.internal.ui.view.SystemResourceSelectionForm;
25
import org.eclipse.rse.internal.ui.view.SystemResourceSelectionForm;
26
import org.eclipse.rse.internal.ui.view.SystemResourceSelectionInputProvider;
27
import org.eclipse.rse.ui.SystemActionViewerFilter;
26
import org.eclipse.rse.ui.SystemActionViewerFilter;
28
import org.eclipse.rse.ui.messages.ISystemMessageLine;
27
import org.eclipse.rse.ui.messages.ISystemMessageLine;
29
import org.eclipse.rse.ui.validators.IValidatorRemoteSelection;
28
import org.eclipse.rse.ui.validators.IValidatorRemoteSelection;
29
import org.eclipse.rse.ui.view.ISystemTree;
30
import org.eclipse.rse.ui.view.SystemResourceSelectionInputProvider;
30
import org.eclipse.swt.widgets.Composite;
31
import org.eclipse.swt.widgets.Composite;
31
import org.eclipse.swt.widgets.Control;
32
import org.eclipse.swt.widgets.Control;
32
import org.eclipse.swt.widgets.Shell;
33
import org.eclipse.swt.widgets.Shell;
Lines 34-40 Link Here
34
35
35
public abstract class SystemRemoteResourceDialog extends SystemPromptDialog
36
public abstract class SystemRemoteResourceDialog extends SystemPromptDialog
36
{
37
{
37
	protected SystemResourceSelectionForm	_form;
38
	private SystemResourceSelectionForm	_form;
38
	private SystemResourceSelectionInputProvider _inputProvider;
39
	private SystemResourceSelectionInputProvider _inputProvider;
39
	private Object _preSelection;
40
	private Object _preSelection;
40
	private IValidatorRemoteSelection _selectionValidator;
41
	private IValidatorRemoteSelection _selectionValidator;
Lines 275-281 Link Here
275
		_form.toggleShowPropertySheet(getShell(), getContents());
276
		_form.toggleShowPropertySheet(getShell(), getContents());
276
		return true;
277
		return true;
277
	}	
278
	}	
279
	
280
	/**
281
	 * Returns the system tree
282
	 * @return the system tree
283
	 */
284
	public ISystemTree getSystemTree()
285
	{
286
		return _form.getSystemTree();
287
	}
278
    
288
    
289
	/**
290
	 * Indicates whether the page for the form is complete or not.
291
	 * @return true if the page associated with the form is complete
292
	 */
293
	public boolean isPageComplete()
294
	{
295
		return _form.isPageComplete();
296
	}
297
	
279
	public abstract SystemActionViewerFilter getViewerFilter();
298
	public abstract SystemActionViewerFilter getViewerFilter();
280
	public abstract String getVerbiage();
299
	public abstract String getVerbiage();
281
	public abstract String getTreeTip();
300
	public abstract String getTreeTip();
(-)UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterPoolWizardInterface.java (+28 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2002, 2007 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
6
 * http://www.eclipse.org/legal/epl-v10.html
7
 *
8
 * Initial Contributors:
9
 * The following IBM employees contributed to the Remote System Explorer
10
 * component that contains this file: David McKnight, Kushal Munir, 
11
 * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
12
 * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
13
 * 
14
 * Contributors:
15
 * {Name} (company) - description of contribution.
16
 *******************************************************************************/
17
18
package org.eclipse.rse.ui.filters.dialogs;
19
import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInterface;
20
import org.eclipse.rse.ui.wizards.ISystemWizard;
21
22
/**
23
 * An interface for filter pool wizards to implement
24
 */
25
public interface SystemFilterPoolWizardInterface 
26
       extends ISystemWizard, SystemFilterPoolDialogInterface
27
{
28
}
(-)UI/org/eclipse/rse/ui/filters/SystemFilterPoolDialogOutputs.java (+37 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2002, 2007 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
6
 * http://www.eclipse.org/legal/epl-v10.html
7
 *
8
 * Initial Contributors:
9
 * The following IBM employees contributed to the Remote System Explorer
10
 * component that contains this file: David McKnight, Kushal Munir, 
11
 * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
12
 * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
13
 * 
14
 * Contributors:
15
 * {Name} (company) - description of contribution.
16
 *******************************************************************************/
17
18
package org.eclipse.rse.ui.filters;
19
//import org.eclipse.rse.core.*;
20
import org.eclipse.rse.core.filters.ISystemFilterPool;
21
import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
22
23
24
25
/**
26
 * A class capturing the attributes commonly returned by dialogs that
27
 * work with filter pools.
28
 */
29
public class SystemFilterPoolDialogOutputs 
30
{
31
32
33
	public String filterPoolName;
34
	public String filterPoolManagerName;	
35
    public SystemSimpleContentElement filterPoolTreeRoot;	
36
    public ISystemFilterPool newPool;
37
}
(-)UI/org/eclipse/rse/ui/filters/SystemFilterPoolDialogInputs.java (+46 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2002, 2007 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
6
 * http://www.eclipse.org/legal/epl-v10.html
7
 *
8
 * Initial Contributors:
9
 * The following IBM employees contributed to the Remote System Explorer
10
 * component that contains this file: David McKnight, Kushal Munir, 
11
 * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
12
 * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
13
 * 
14
 * Contributors:
15
 * {Name} (company) - description of contribution.
16
 *******************************************************************************/
17
18
package org.eclipse.rse.ui.filters;
19
//import org.eclipse.rse.core.*;
20
import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
21
import org.eclipse.rse.core.filters.ISystemFilterPoolManagerProvider;
22
import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager;
23
import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
24
import org.eclipse.rse.ui.filters.dialogs.SystemFilterDialogInputs;
25
26
27
28
/**
29
 * A class capturing the attributes commonly needed by dialogs that
30
 * work with filter pools.
31
 */
32
public class SystemFilterPoolDialogInputs extends SystemFilterDialogInputs
33
{
34
35
36
    public ISystemFilterPoolManagerProvider poolManagerProvider = null;
37
	public ISystemFilterPoolManager[] poolManagers = null;
38
	public ISystemFilterPoolReferenceManager refManager = null;
39
	public int mgrSelection = 0;
40
	public String poolNamePrompt;	
41
	public String poolNameTip;	
42
	public String poolMgrNamePrompt;
43
	public String poolMgrNameTip;	
44
	
45
    public SystemSimpleContentElement filterPoolTreeRoot;
46
}
(-)UI/org/eclipse/rse/ui/view/ISystemSelectRemoteObjectAPIProvider.java (+98 lines)
Added Link Here
1
/********************************************************************************
2
 * Copyright (c) 2008 IBM Corporation. All rights reserved.
3
 * This program and the accompanying materials are made available under the terms
4
 * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
5
 * available at http://www.eclipse.org/legal/epl-v10.html
6
 * 
7
 * Initial Contributors:
8
 * The following IBM employees contributed to the Remote System Explorer
9
 * component that contains this file: David McKnight.
10
 * 
11
 * Contributors:
12
 * {Name} (company) - description of contribution.
13
 ********************************************************************************/
14
package org.eclipse.rse.ui.view;
15
16
import org.eclipse.rse.core.IRSESystemType;
17
import org.eclipse.rse.core.filters.ISystemFilter;
18
import org.eclipse.rse.core.model.IHost;
19
import org.eclipse.rse.core.model.ISystemViewInputProvider;
20
21
public interface ISystemSelectRemoteObjectAPIProvider 
22
		extends ISystemViewInputProvider
23
{
24
	/**
25
	 * This method is called by the connection adapter when the user expands
26
	 *  a connection. This method must return the child objects to show for that
27
	 *  connection.
28
	 */
29
	public Object[] getConnectionChildren(IHost selectedConnection);
30
	
31
	/**
32
	 * Get the name of the item to select when the first filter is expanded.
33
	 * Called by the filter adapter.
34
	 */
35
	public String getPreSelectFilterChild();
36
	
37
	/**
38
	 * Get the actual object of the item to select when the first filter is expanded.
39
	 * Called by the GUI form after expansion, so it can select this object
40
	 */
41
	public Object getPreSelectFilterChildObject();
42
	
43
	/**
44
	 * Set the filter string to use to resolve the inputs. 
45
	 * If this is an absolute filter string, it gets turned into a quick filter string,
46
	 *  so that the user sees it and can expand it. If it is a relative filter string 
47
	 *  to apply to all expansions, it is used to decorate all filtering as the user drills down.
48
	 */
49
	public void setFilterString(String string);
50
	
51
	/**
52
	 * Set actual child object of the first filter to preselect. Called
53
	 * by the filter adapter once the children are resolved and a match on
54
	 * the name is found.
55
	 */
56
	public void setPreSelectFilterChildObject(Object obj);
57
58
	/**
59
	 * Set child of the first filter to preselect 
60
	 */
61
	public void setPreSelectFilterChild(String name);
62
	
63
	/**
64
	 * Set the quick filters to be exposed to the user. These will be shown to the
65
	 *  user when they expand a connection.
66
	 * @see org.eclipse.rse.core.filters.SystemFilterSimple
67
	 */
68
	public void setQuickFilters(ISystemFilter[] filters);
69
70
	
71
	/**
72
	 * Specify whether the user should see the "New Connection..." special connection prompt
73
	 */
74
	public void setShowNewConnectionPrompt(boolean show);
75
	
76
	
77
	/** 
78
	 * Default or Restrict to a specific connection.
79
	 * If default mode, it is preselected.
80
	 * If only mode, it is the only connection listed.
81
	 * @param connection The connection to default or restrict to
82
	 * @param onlyMode true if this is to be the only connection shown in the list
83
	 */
84
	public void setSystemConnection(IHost connection, boolean onlyMode);
85
86
87
	/**
88
	 * Specify system types to restrict what types of connections
89
	 * the user can create, and see.
90
	 * This will override subsystemConfigurationId,if that has been set!
91
	 * 
92
     * @param systemTypes An array of system types, or
93
     *     <code>null</code> to allow all registered valid system types.
94
     *     A system type is valid if at least one subsystem configuration
95
     *     is registered against it.
96
	 */
97
	public void setSystemTypes(IRSESystemType[] systemTypes);
98
}
(-)UI/org/eclipse/rse/ui/filters/SystemFilterPoolDialogInterface.java (+41 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2002, 2007 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
6
 * http://www.eclipse.org/legal/epl-v10.html
7
 *
8
 * Initial Contributors:
9
 * The following IBM employees contributed to the Remote System Explorer
10
 * component that contains this file: David McKnight, Kushal Munir, 
11
 * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
12
 * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
13
 * 
14
 * Contributors:
15
 * {Name} (company) - description of contribution.
16
 *******************************************************************************/
17
18
package org.eclipse.rse.ui.filters;
19
import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction;
20
21
22
/**
23
 * Common interface for dialogs or wizards that work with filter pools.
24
 */
25
public interface SystemFilterPoolDialogInterface 
26
{
27
28
29
	/**
30
	 * Allow base action to pass instance of itself for callback to get info
31
	 */
32
    public void setFilterPoolDialogActionCaller(SystemFilterAbstractFilterPoolAction caller);
33
    /**
34
     * Return an object containing user-specified information pertinent to filter pool actions
35
     */
36
    public SystemFilterPoolDialogOutputs getFilterPoolDialogOutputs();    
37
    /**
38
     * Set the help context id for this wizard
39
     */
40
    public void setHelpContextId(String id);
41
}
(-)UI/org/eclipse/rse/ui/view/ISystemTableViewColumnManager.java (+23 lines)
Added Link Here
1
/********************************************************************************
2
 * Copyright (c) 2008 IBM Corporation. All rights reserved.
3
 * This program and the accompanying materials are made available under the terms
4
 * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
5
 * available at http://www.eclipse.org/legal/epl-v10.html
6
 * 
7
 * Initial Contributors:
8
 * The following IBM employees contributed to the Remote System Explorer
9
 * component that contains this file: David McKnight.
10
 * 
11
 * Contributors:
12
 * {Name} (company) - description of contribution.
13
 ********************************************************************************/
14
package org.eclipse.rse.ui.view;
15
16
import org.eclipse.ui.views.properties.IPropertyDescriptor;
17
18
public interface ISystemTableViewColumnManager {
19
20
	public IPropertyDescriptor[] getVisibleDescriptors(ISystemViewElementAdapter adapter);
21
	
22
	public void setCustomDescriptors(ISystemViewElementAdapter adapter, IPropertyDescriptor[] descriptors);
23
}
(-)UI/org/eclipse/rse/ui/view/SystemResourceSelectionInputProvider.java (+142 lines)
Added Link Here
1
/********************************************************************************
2
 * Copyright (c) 2004, 2007 IBM Corporation and others. All rights reserved.
3
 * This program and the accompanying materials are made available under the terms
4
 * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
5
 * available at http://www.eclipse.org/legal/epl-v10.html
6
 * 
7
 * Initial Contributors:
8
 * The following IBM employees contributed to the Remote System Explorer
9
 * component that contains this file: David McKnight, Kushal Munir, 
10
 * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
11
 * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
12
 * 
13
 * Contributors:
14
 * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
15
 * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
16
 * Martin Oberhuber (Wind River) - [202866] Fix exceptions in RSE browse dialog when SystemRegistry is not yet fully initialized
17
 ********************************************************************************/
18
19
package org.eclipse.rse.ui.view;
20
import org.eclipse.rse.core.IRSESystemType;
21
import org.eclipse.rse.core.RSECorePlugin;
22
import org.eclipse.rse.core.model.IHost;
23
import org.eclipse.rse.core.model.ISystemRegistry;
24
import org.eclipse.rse.core.subsystems.ISubSystem;
25
26
27
public abstract class SystemResourceSelectionInputProvider extends SystemAbstractAPIProvider
28
{		
29
	private IHost _connection = null;
30
	private boolean _onlyConnection = false;
31
	private boolean _allowNew = true;
32
	private IRSESystemType[] _systemTypes;
33
	private String _category = null;
34
	
35
	public SystemResourceSelectionInputProvider(IHost connection)
36
	{
37
		_connection = connection;
38
	}
39
	
40
	public SystemResourceSelectionInputProvider()
41
	{
42
		// choose random host
43
		ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
44
		IHost[] hosts = registry.getHosts();
45
		if (hosts != null && hosts.length>0) {
46
			_connection = hosts[0];
47
		}
48
	}
49
	
50
	public IHost getSystemConnection()
51
	{
52
		return _connection;
53
	}
54
	
55
	public boolean allowMultipleConnections()
56
	{
57
		return !_onlyConnection;
58
	}
59
	
60
	public void setAllowNewConnection(boolean flag)
61
	{
62
		_allowNew = flag;
63
	}
64
	
65
	public boolean allowNewConnection()
66
	{
67
		return _allowNew;
68
	}
69
	
70
	public void setSystemConnection(IHost connection, boolean onlyConnection)
71
	{
72
		_connection = connection;
73
		_onlyConnection = onlyConnection;
74
	}
75
	
76
	public IRSESystemType[] getSystemTypes()
77
	{
78
		return _systemTypes;
79
	}
80
	
81
	public void setSystemTypes(IRSESystemType[] types)
82
	{
83
		_systemTypes = types;
84
	}
85
	
86
	public Object[] getSystemViewRoots()
87
	{
88
		if (_connection == null)
89
		{
90
			ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
91
			IHost[] hosts = registry.getHosts();
92
			if (hosts!=null && hosts.length!=0) {
93
				_connection = registry.getHosts()[0];
94
			}
95
		}
96
		return getConnectionChildren(_connection);
97
	}
98
99
	public boolean hasSystemViewRoots()
100
	{
101
		return false;
102
	}
103
104
	public Object[] getConnectionChildren(IHost selectedConnection)
105
	{
106
		if (selectedConnection != null)
107
		{
108
			ISubSystem ss = getSubSystem(selectedConnection);
109
			if (ss!=null) {
110
				return ss.getChildren();
111
			}
112
		}
113
		return new Object[0];
114
	}
115
116
	public boolean hasConnectionChildren(IHost selectedConnection)
117
	{
118
		if (selectedConnection != null)
119
		{
120
			ISubSystem ss = getSubSystem(selectedConnection);
121
			if (ss!=null) {
122
				return ss.hasChildren();
123
			}
124
		}
125
		return false;
126
	}
127
	
128
	protected abstract ISubSystem getSubSystem(IHost selectedConnection);
129
	
130
	
131
	public void setCategory(String category)
132
	{
133
		_category = category;
134
	}
135
	
136
	public String getCategory()
137
	{
138
		return _category;
139
	}
140
	
141
	
142
}
(-)UI/org/eclipse/rse/ui/view/SystemAbstractAPIProvider.java (+210 lines)
Added Link Here
1
/********************************************************************************
2
 * Copyright (c) 2002, 2008 IBM Corporation and others. All rights reserved.
3
 * This program and the accompanying materials are made available under the terms
4
 * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
5
 * available at http://www.eclipse.org/legal/epl-v10.html
6
 * 
7
 * Initial Contributors:
8
 * The following IBM employees contributed to the Remote System Explorer
9
 * component that contains this file: David McKnight, Kushal Munir, 
10
 * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
11
 * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
12
 * 
13
 * Contributors:
14
 * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
15
 * Tobias Schwarz   (Wind River) - [173267] "empty list" should not be displayed 
16
 * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core
17
 * Martin Oberhuber (Wind River) - [218524][api] Remove deprecated ISystemViewInputProvider#getShell()
18
 ********************************************************************************/
19
20
package org.eclipse.rse.ui.view;
21
import org.eclipse.core.runtime.Platform;
22
import org.eclipse.core.runtime.Preferences;
23
import org.eclipse.jface.viewers.Viewer;
24
import org.eclipse.rse.core.RSECorePlugin;
25
import org.eclipse.rse.core.model.ISystemMessageObject;
26
import org.eclipse.rse.core.model.ISystemRegistry;
27
import org.eclipse.rse.core.model.ISystemViewInputProvider;
28
import org.eclipse.rse.core.model.SystemMessageObject;
29
import org.eclipse.rse.ui.ISystemMessages;
30
import org.eclipse.rse.ui.ISystemPreferencesConstants;
31
import org.eclipse.rse.ui.RSEUIPlugin;
32
import org.eclipse.swt.widgets.Shell;
33
34
35
36
/**
37
 * This is a base class that a provider of root nodes to the remote systems tree viewer part can
38
 * use as a parent class.
39
 */
40
public abstract class SystemAbstractAPIProvider 
41
       implements ISystemViewInputProvider
42
{
43
	protected Viewer viewer;
44
	protected ISystemRegistry sr;
45
	
46
	protected Object[] emptyList = new Object[0];
47
	protected Object[] msgList   = new Object[1];
48
	/**
49
	 * @deprecated Use {@link #checkForEmptyList(Object[], Object, boolean)} instead.
50
	 */
51
	protected SystemMessageObject nullObject     = null;
52
	protected SystemMessageObject canceledObject = null;	
53
	protected SystemMessageObject errorObject    = null;	
54
	
55
	private Preferences fPrefStore = null;
56
	
57
	/**
58
	 * Constructor 
59
	 */
60
	public SystemAbstractAPIProvider()
61
	{
62
		super();
63
		sr = RSECorePlugin.getTheSystemRegistry();
64
	}
65
	
66
    /**
67
	 * This is the method required by the IAdaptable interface.
68
	 * Given an adapter class type, return an object castable to the type, or
69
	 *  null if this is not possible.
70
	 */
71
    public Object getAdapter(Class adapterType)
72
    {
73
   	    return Platform.getAdapterManager().getAdapter(this, adapterType);	
74
    }           
75
76
    /*
77
     * (non-Javadoc)
78
     * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#setViewer(java.lang.Object)
79
     */
80
    public void setViewer(Object viewer)
81
    {
82
    	this.viewer = (Viewer)viewer;
83
    }
84
    
85
    /*
86
     * (non-Javadoc)
87
     * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#getViewer()
88
     */
89
    public Object getViewer()
90
    {
91
    	return viewer;
92
    }
93
94
    protected final void initMsgObjects()
95
 	{
96
 		nullObject     = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_EMPTY),ISystemMessageObject.MSGTYPE_EMPTY, null);
97
 		canceledObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_LIST_CANCELED),ISystemMessageObject.MSGTYPE_CANCEL, null);
98
 		errorObject    = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_FAILED),ISystemMessageObject.MSGTYPE_ERROR, null);
99
 	}
100
101
    /**
102
     * <i>Callable by subclasses. Do not override</i><br>
103
     * In getChildren, return <samp>checkForEmptyList(children, parent, true/false)<.samp>
104
     * versus your array directly. This method checks for a null array which is
105
     * not allowed and replaces it with an empty array. 
106
     * If true is passed then it returns the "Empty list" message object if the array is null or empty
107
     * 
108
     * @param children The list of children.
109
     * @param parent The parent for the children.
110
     * @param returnNullMsg <code>true</code> if an "Empty List" message should be returned.
111
     * @return The list of children, a list with the "Empty List" message object or an empty list.
112
     */
113
    protected Object[] checkForEmptyList(Object[] children, Object parent, boolean returnNullMsg) {
114
    	if ((children == null) || (children.length == 0)) {
115
    		if (fPrefStore == null) {
116
    			fPrefStore = RSEUIPlugin.getDefault().getPluginPreferences();
117
    		}
118
    		if (!returnNullMsg
119
    				|| (fPrefStore != null && !fPrefStore
120
    						.getBoolean(ISystemPreferencesConstants.SHOW_EMPTY_LISTS))) {
121
    			return emptyList;
122
    		} else {
123
    			return new Object[] {
124
    				new SystemMessageObject(
125
    					RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_EMPTY),
126
    					ISystemMessageObject.MSGTYPE_EMPTY, 
127
    					parent)};
128
    		}
129
    	}
130
    	return children;
131
    }
132
    
133
    /**
134
     * In getChildren, return checkForNull(children, true/false) vs your array directly.
135
     * This method checks for a null array which not allow and replaces it with an empty array.
136
     * If true is passed then it returns the "Empty list" message object if the array is null or empty
137
     * 
138
     * @deprecated Use {@link #checkForEmptyList(Object[], Object, boolean)} instead.
139
     */
140
    protected Object[] checkForNull(Object[] children, boolean returnNullMsg)
141
    {
142
	   if ((children == null) || (children.length==0))
143
	   {
144
	   	 if (!returnNullMsg)
145
           return emptyList;
146
         else
147
         {
148
	 	   if (nullObject == null)
149
	 	     initMsgObjects();
150
	 	   msgList[0] = nullObject;
151
	 	   return msgList;
152
         }
153
	   }
154
       else
155
         return children;
156
    }
157
158
    /**
159
     * Return the "Operation cancelled by user" msg as an object array so can be used to answer getChildren()
160
     */
161
    protected Object[] getCancelledMessageObject()
162
    {    	
163
		 if (canceledObject == null)
164
		   initMsgObjects();
165
		 msgList[0] = canceledObject;
166
		 return msgList;
167
    }    
168
169
    /**
170
     * Return the "Operation failed" msg as an object array so can be used to answer getChildren()
171
     */
172
    protected Object[] getFailedMessageObject()
173
    {    	
174
		 if (errorObject == null)
175
		   initMsgObjects();
176
		 msgList[0] = errorObject;
177
		 return msgList;
178
    }    
179
180
	/**
181
	 * Return true if we are listing connections or not, so we know whether we are interested in 
182
	 *  connection-add events
183
	 */
184
	public boolean showingConnections()
185
	{
186
		return false;
187
	}
188
189
	// ------------------
190
	// HELPER METHODS...
191
	// ------------------	
192
    /**
193
     * Returns the implementation of ISystemViewElement for the given
194
     * object.  Returns null if the adapter is not defined or the
195
     * object is not adaptable.
196
     */
197
    protected ISystemViewElementAdapter getViewAdapter(Object o) 
198
    {
199
    	return SystemAdapterHelpers.getViewAdapter(o);
200
    }
201
    
202
    /**
203
     * Returns the implementation of ISystemRemoteElement for the given
204
     * object.  Returns null if this object does not adaptable to this.
205
     */
206
    protected ISystemRemoteElementAdapter getRemoteAdapter(Object o) 
207
    {
208
    	return SystemAdapterHelpers.getRemoteAdapter(o);
209
    }
210
}
(-)UI/org/eclipse/rse/internal/ui/actions/SystemTestFilterStringAction.java (+96 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2002, 2007 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
6
 * http://www.eclipse.org/legal/epl-v10.html
7
 *
8
 * Initial Contributors:
9
 * The following IBM employees contributed to the Remote System Explorer
10
 * component that contains this file: David McKnight, Kushal Munir, 
11
 * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
12
 * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
13
 * 
14
 * Contributors:
15
 * {Name} (company) - description of contribution.
16
 *******************************************************************************/
17
18
package org.eclipse.rse.internal.ui.actions;
19
import org.eclipse.jface.dialogs.Dialog;
20
import org.eclipse.rse.core.subsystems.ISubSystem;
21
import org.eclipse.rse.internal.ui.SystemResources;
22
import org.eclipse.rse.internal.ui.dialogs.SystemTestFilterStringDialog;
23
import org.eclipse.rse.ui.actions.SystemBaseDialogAction;
24
import org.eclipse.swt.widgets.Shell;
25
26
27
/**
28
 * The action for testing a given filter string by resolving it and showing the resolve results
29
 */
30
public class SystemTestFilterStringAction extends SystemBaseDialogAction 
31
                                 
32
{
33
	
34
	protected ISubSystem subsystem;
35
	protected String filterString;
36
	
37
	/**
38
	 * Constructor when input subsystem and filter string are known already
39
	 */
40
	public SystemTestFilterStringAction(Shell shell, ISubSystem subsystem, String filterString) 
41
	{
42
		super(SystemResources.ACTION_TESTFILTERSTRING_LABEL, SystemResources.ACTION_TESTFILTERSTRING_TOOLTIP, null,
43
		      shell);
44
		allowOnMultipleSelection(false);
45
		setSubSystem(subsystem);
46
		setFilterString(filterString);
47
	}
48
	/**
49
	 * Constructor when input subsystem and filter string are not known already.
50
	 * @see #setSubSystem(ISubSystem)
51
	 * @see #setFilterString(String)
52
	 */
53
	public SystemTestFilterStringAction(Shell shell) 
54
	{
55
		this(shell, null, null);
56
	}
57
	
58
	/**
59
	 * Set the subsystem within the context of which this filter string is to be tested.
60
	 */
61
	public void setSubSystem(ISubSystem subsystem)
62
	{
63
		this.subsystem = subsystem;
64
	}
65
	
66
	/**
67
	 * Set the filter string to test
68
	 */
69
	public void setFilterString(String filterString)
70
	{
71
		this.filterString = filterString;
72
	}
73
	
74
	/**
75
	 * If you decide to use the supplied run method as is,
76
	 *  then you must override this method to create and return
77
	 *  the dialog that is displayed by the default run method
78
	 *  implementation.
79
	 * <p>
80
	 * If you override run with your own, then
81
	 *  simply implement this to return null as it won't be used.
82
	 * @see #run()
83
	 */
84
	protected Dialog createDialog(Shell shell)
85
	{
86
		return new SystemTestFilterStringDialog(shell, subsystem, filterString);
87
	}
88
	
89
	/**
90
	 * Required by parent. We just return null.
91
	 */
92
	protected Object getDialogValue(Dialog dlg)
93
	{
94
		return null;
95
	}
96
}
(-)src/org/eclipse/rse/processes/ui/SystemProcessFilterStringEditPane.java (-4 / +1 lines)
Lines 28-33 Link Here
28
import org.eclipse.rse.internal.processes.ui.SystemProcessesResources;
28
import org.eclipse.rse.internal.processes.ui.SystemProcessesResources;
29
import org.eclipse.rse.internal.processes.ui.view.SystemProcessStatesContentProvider;
29
import org.eclipse.rse.internal.processes.ui.view.SystemProcessStatesContentProvider;
30
import org.eclipse.rse.internal.ui.SystemResources;
30
import org.eclipse.rse.internal.ui.SystemResources;
31
import org.eclipse.rse.internal.ui.actions.SystemTestFilterStringAction;
31
import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
32
import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
32
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
33
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
33
import org.eclipse.rse.services.clientserver.processes.HostProcessFilterImpl;
34
import org.eclipse.rse.services.clientserver.processes.HostProcessFilterImpl;
Lines 35-41 Link Here
35
import org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcessSubSystemConfiguration;
36
import org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcessSubSystemConfiguration;
36
import org.eclipse.rse.ui.SystemBasePlugin;
37
import org.eclipse.rse.ui.SystemBasePlugin;
37
import org.eclipse.rse.ui.SystemWidgetHelpers;
38
import org.eclipse.rse.ui.SystemWidgetHelpers;
38
import org.eclipse.rse.ui.actions.SystemTestFilterStringAction;
39
import org.eclipse.rse.ui.filters.SystemFilterStringEditPane;
39
import org.eclipse.rse.ui.filters.SystemFilterStringEditPane;
40
import org.eclipse.rse.ui.messages.SystemMessageDialog;
40
import org.eclipse.rse.ui.messages.SystemMessageDialog;
41
import org.eclipse.rse.ui.validators.ValidatorIntegerInput;
41
import org.eclipse.rse.ui.validators.ValidatorIntegerInput;
Lines 93-101 Link Here
93
    protected boolean dontStealFocus;
93
    protected boolean dontStealFocus;
94
	protected IRemoteProcessSubSystemConfiguration inputSubsystemConfiguration = null;
94
	protected IRemoteProcessSubSystemConfiguration inputSubsystemConfiguration = null;
95
	
95
	
96
	// actions
97
	protected SystemTestFilterStringAction testAction = null;
98
99
	// constants
96
	// constants
100
	protected final static int SIZING_SELECTION_WIDGET_HEIGHT = 90;
97
	protected final static int SIZING_SELECTION_WIDGET_HEIGHT = 90;
101
	protected final static int SIZING_SELECTION_WIDGET_WIDTH = 145;
98
	protected final static int SIZING_SELECTION_WIDGET_WIDTH = 145;
(-)src/org/eclipse/rse/internal/files/ui/search/SystemSearchRemoteFolderForm.java (-2 / +2 lines)
Lines 10-18 Link Here
10
package org.eclipse.rse.internal.files.ui.search;
10
package org.eclipse.rse.internal.files.ui.search;
11
11
12
import org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm;
12
import org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm;
13
import org.eclipse.rse.internal.ui.view.SystemSelectRemoteObjectAPIProviderImpl;
14
import org.eclipse.rse.subsystems.files.core.model.ISystemFileRemoteTypes;
13
import org.eclipse.rse.subsystems.files.core.model.ISystemFileRemoteTypes;
15
import org.eclipse.rse.ui.messages.ISystemMessageLine;
14
import org.eclipse.rse.ui.messages.ISystemMessageLine;
15
import org.eclipse.rse.ui.view.ISystemSelectRemoteObjectAPIProvider;
16
16
17
/**
17
/**
18
 * The selection form to use is search selection dialogs.
18
 * The selection form to use is search selection dialogs.
Lines 32-38 Link Here
32
	 * Returns an instance of the search input provider {@link SystemSearchRemoteObjectAPIProvider}
32
	 * Returns an instance of the search input provider {@link SystemSearchRemoteObjectAPIProvider}
33
	 * @see org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm#getInputProvider()
33
	 * @see org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm#getInputProvider()
34
	 */
34
	 */
35
	protected SystemSelectRemoteObjectAPIProviderImpl getInputProvider() {
35
	protected ISystemSelectRemoteObjectAPIProvider getInputProvider() {
36
		
36
		
37
		if (inputProvider == null) {
37
		if (inputProvider == null) {
38
		    // create the input provider that drives the contents of the tree
38
		    // create the input provider that drives the contents of the tree
(-)src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFilesForm.java (-1 / +1 lines)
Lines 511-517 Link Here
511
	/**
511
	/**
512
	 * Get the action to run when "Select Types..." is pressed by the user
512
	 * Get the action to run when "Select Types..." is pressed by the user
513
	 */
513
	 */
514
	protected SystemSelectFileTypesAction getSelectTypesAction()
514
	private SystemSelectFileTypesAction getSelectTypesAction()
515
	{
515
	{
516
		if (typesAction == null)
516
		if (typesAction == null)
517
		  typesAction = new SystemSelectFileTypesAction(getShell());
517
		  typesAction = new SystemSelectFileTypesAction(getShell());
(-)src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java (-14 / +22 lines)
Lines 54-59 Link Here
54
import org.eclipse.rse.ui.messages.ISystemMessageLine;
54
import org.eclipse.rse.ui.messages.ISystemMessageLine;
55
import org.eclipse.rse.ui.validators.IValidatorRemoteSelection;
55
import org.eclipse.rse.ui.validators.IValidatorRemoteSelection;
56
import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
56
import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
57
import org.eclipse.rse.ui.view.ISystemSelectRemoteObjectAPIProvider;
58
import org.eclipse.rse.ui.view.ISystemTree;
57
import org.eclipse.rse.ui.view.SystemAdapterHelpers;
59
import org.eclipse.rse.ui.view.SystemAdapterHelpers;
58
import org.eclipse.swt.SWT;
60
import org.eclipse.swt.SWT;
59
import org.eclipse.swt.graphics.Point;
61
import org.eclipse.swt.graphics.Point;
Lines 106-113 Link Here
106
	// GUI widgets
108
	// GUI widgets
107
    protected Label                   verbiageLabel, spacer1, spacer2;
109
    protected Label                   verbiageLabel, spacer1, spacer2;
108
	protected Text                    nameEntryValue;
110
	protected Text                    nameEntryValue;
109
	protected SystemViewForm          tree;
111
	private SystemViewForm          tree;
110
    protected SystemPropertySheetForm ps;
112
    private SystemPropertySheetForm ps;
111
	protected ISystemMessageLine      msgLine;	
113
	protected ISystemMessageLine      msgLine;	
112
	protected Composite               outerParent, ps_composite;	
114
	protected Composite               outerParent, ps_composite;	
113
	// inputs
115
	// inputs
Lines 135-141 Link Here
135
	protected IHost outputConnection = null;
137
	protected IHost outputConnection = null;
136
	// state
138
	// state
137
	//protected ResourceBundle rb;
139
	//protected ResourceBundle rb;
138
    protected SystemSelectRemoteObjectAPIProviderImpl inputProvider = null;
140
    protected ISystemSelectRemoteObjectAPIProvider inputProvider = null;
139
    protected ISystemFilter preSelectFilter;
141
    protected ISystemFilter preSelectFilter;
140
    protected String       preSelectFilterChild;
142
    protected String       preSelectFilterChild;
141
    protected boolean      preSelectRoot;
143
    protected boolean      preSelectRoot;
Lines 195-201 Link Here
195
	 * Returns the input provider that drives the contents of the tree
197
	 * Returns the input provider that drives the contents of the tree
196
	 * Subclasses can override to provide custom tree contents
198
	 * Subclasses can override to provide custom tree contents
197
	 */
199
	 */
198
	protected SystemSelectRemoteObjectAPIProviderImpl getInputProvider()
200
	protected ISystemSelectRemoteObjectAPIProvider getInputProvider()
199
	{
201
	{
200
		if (inputProvider == null)
202
		if (inputProvider == null)
201
		{
203
		{
Lines 568-581 Link Here
568
    	return outputConnection;
570
    	return outputConnection;
569
    }
571
    }
570
572
571
    /**
572
     * Return the embedded System Tree object.
573
     * Will be null until createContents is called.
574
     */
575
    public SystemViewForm getSystemViewForm()
576
    {
577
    	return tree;
578
    }
579
	
573
	
580
    /**
574
    /**
581
     * Return the multiple selection mode current setting
575
     * Return the multiple selection mode current setting
Lines 753-759 Link Here
753
		  //tree.setToolTipText(treeTip); //EXTREMELY ANNOYING!
747
		  //tree.setToolTipText(treeTip); //EXTREMELY ANNOYING!
754
		if (autoExpandDepth != 0)
748
		if (autoExpandDepth != 0)
755
		{
749
		{
756
		  tree.getSystemView().setAutoExpandLevel(autoExpandDepth);
750
		  tree.getSystemTree().setAutoExpandLevel(autoExpandDepth);
757
		  tree.reset(inputProvider);
751
		  tree.reset(inputProvider);
758
		}
752
		}
759
753
Lines 803-809 Link Here
803
     */
797
     */
804
    protected IHost internalGetConnection()
798
    protected IHost internalGetConnection()
805
    {
799
    {
806
    	Object parent = tree.getSystemView().getRootParent();
800
    	Object parent = tree.getSystemTree().getRootParent();
807
    	if (parent instanceof IHost)
801
    	if (parent instanceof IHost)
808
    	{
802
    	{
809
    		return (IHost)parent;
803
    		return (IHost)parent;
Lines 1058-1061 Link Here
1058
	public void setAllowFolderSelection(boolean allow) {
1052
	public void setAllowFolderSelection(boolean allow) {
1059
	    allowFolderSelection = allow;
1053
	    allowFolderSelection = allow;
1060
	}
1054
	}
1055
	
1056
	/**
1057
	 * Returns the system tree
1058
	 * @return the system tree
1059
	 */
1060
	public ISystemTree getSystemTree()
1061
	{
1062
		return tree.getSystemTree();
1063
	}
1064
	
1065
	public Object getSelectedParent()
1066
	{
1067
		return tree.getSelectedParent();
1068
	}
1061
}
1069
}
(-)src/org/eclipse/rse/files/ui/widgets/SystemFileFilterStringEditPane.java (-4 / +4 lines)
Lines 33-38 Link Here
33
import org.eclipse.rse.internal.files.ui.ISystemFileConstants;
33
import org.eclipse.rse.internal.files.ui.ISystemFileConstants;
34
import org.eclipse.rse.internal.files.ui.actions.SystemSelectFileTypesAction;
34
import org.eclipse.rse.internal.files.ui.actions.SystemSelectFileTypesAction;
35
import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
35
import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
36
import org.eclipse.rse.internal.ui.actions.SystemTestFilterStringAction;
36
import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
37
import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
37
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
38
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
38
import org.eclipse.rse.subsystems.files.core.model.RemoteFileFilterString;
39
import org.eclipse.rse.subsystems.files.core.model.RemoteFileFilterString;
Lines 43-49 Link Here
43
import org.eclipse.rse.ui.RSEUIPlugin;
44
import org.eclipse.rse.ui.RSEUIPlugin;
44
import org.eclipse.rse.ui.SystemBasePlugin;
45
import org.eclipse.rse.ui.SystemBasePlugin;
45
import org.eclipse.rse.ui.SystemWidgetHelpers;
46
import org.eclipse.rse.ui.SystemWidgetHelpers;
46
import org.eclipse.rse.ui.actions.SystemTestFilterStringAction;
47
import org.eclipse.rse.ui.filters.SystemFilterStringEditPane;
47
import org.eclipse.rse.ui.filters.SystemFilterStringEditPane;
48
import org.eclipse.rse.ui.messages.SystemMessageDialog;
48
import org.eclipse.rse.ui.messages.SystemMessageDialog;
49
import org.eclipse.rse.ui.validators.ISystemValidator;
49
import org.eclipse.rse.ui.validators.ISystemValidator;
Lines 97-104 Link Here
97
	protected RemoteFileSubSystemConfiguration inputSubsystemConfiguration = null;
97
	protected RemoteFileSubSystemConfiguration inputSubsystemConfiguration = null;
98
	
98
	
99
	// actions
99
	// actions
100
	protected SystemTestFilterStringAction testAction = null;
100
	private SystemTestFilterStringAction testAction = null;
101
    protected SystemSelectFileTypesAction typesAction = null;
101
    private SystemSelectFileTypesAction typesAction = null;
102
102
103
	
103
	
104
	/**
104
	/**
Lines 474-480 Link Here
474
	/**
474
	/**
475
	 * Get the action to run when "Select Types..." is pressed by the user
475
	 * Get the action to run when "Select Types..." is pressed by the user
476
	 */
476
	 */
477
	protected SystemSelectFileTypesAction getSelectTypesAction()
477
	private SystemSelectFileTypesAction getSelectTypesAction()
478
	{
478
	{
479
		if (typesAction == null)
479
		if (typesAction == null)
480
		  typesAction = new SystemSelectFileTypesAction(selectTypesButton.getShell());
480
		  typesAction = new SystemSelectFileTypesAction(selectTypesButton.getShell());
(-)src/org/eclipse/rse/files/ui/widgets/SaveAsForm.java (-1 / +1 lines)
Lines 209-215 Link Here
209
					if (fileNameText != null)
209
					if (fileNameText != null)
210
					{	
210
					{	
211
						// simulate the parent file being selected...
211
						// simulate the parent file being selected...
212
						Object parentFile = tree.getSelectedParent();
212
						Object parentFile = getSelectedParent();
213
															    		
213
															    		
214
						if (remoteFile.isFile())
214
						if (remoteFile.isFile())
215
						{	
215
						{	
(-)src/org/eclipse/rse/files/ui/dialogs/SystemSelectRemoteFileOrFolderDialog.java (-12 / +6 lines)
Lines 26-38 Link Here
26
import org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm;
26
import org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm;
27
import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
27
import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
28
import org.eclipse.rse.internal.ui.SystemResources;
28
import org.eclipse.rse.internal.ui.SystemResources;
29
import org.eclipse.rse.internal.ui.view.SystemView;
30
import org.eclipse.rse.internal.ui.view.SystemViewForm;
31
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
29
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
32
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
30
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
33
import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
31
import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
34
import org.eclipse.rse.ui.messages.ISystemMessageLine;
32
import org.eclipse.rse.ui.messages.ISystemMessageLine;
35
import org.eclipse.rse.ui.validators.IValidatorRemoteSelection;
33
import org.eclipse.rse.ui.validators.IValidatorRemoteSelection;
34
import org.eclipse.rse.ui.view.ISystemTree;
36
import org.eclipse.swt.widgets.Composite;
35
import org.eclipse.swt.widgets.Composite;
37
import org.eclipse.swt.widgets.Control;
36
import org.eclipse.swt.widgets.Control;
38
import org.eclipse.swt.widgets.Shell;
37
import org.eclipse.swt.widgets.Shell;
Lines 402-415 Link Here
402
    {
401
    {
403
    	return multipleSelectionMode;
402
    	return multipleSelectionMode;
404
    }
403
    }
405
    /**
404
406
     * Return the embedded System Tree object.
407
     * Will be null until createContents is called.
408
     */
409
    public SystemViewForm getSystemViewForm()
410
    {
411
    	return form.getSystemViewForm();
412
    }
413
405
414
    // ------------------
406
    // ------------------
415
    // PRIVATE METHODS...
407
    // PRIVATE METHODS...
Lines 421-427 Link Here
421
    protected Control createContents(Composite parent) 
413
    protected Control createContents(Composite parent) 
422
	{
414
	{
423
    	Control control = super.createContents(parent);
415
    	Control control = super.createContents(parent);
424
    	form.getSystemViewForm().getSystemView().addDoubleClickListener(new IDoubleClickListener() {
416
    	form.getSystemTree().addDoubleClickListener(new IDoubleClickListener() {
425
			public void doubleClick(DoubleClickEvent event) {
417
			public void doubleClick(DoubleClickEvent event) {
426
				handleDoubleClick(event);
418
				handleDoubleClick(event);
427
			}
419
			}
Lines 435-441 Link Here
435
	 */
427
	 */
436
	protected void handleDoubleClick(DoubleClickEvent event) 
428
	protected void handleDoubleClick(DoubleClickEvent event) 
437
	{
429
	{
438
		SystemView tree = form.getSystemViewForm().getSystemView();
430
		ISystemTree tree = form.getSystemTree();
439
		IStructuredSelection s = (IStructuredSelection) event.getSelection();
431
		IStructuredSelection s = (IStructuredSelection) event.getSelection();
440
		Object element = s.getFirstElement();
432
		Object element = s.getFirstElement();
441
		if (element == null)
433
		if (element == null)
Lines 609-612 Link Here
609
	        form.setAllowFolderSelection(allow);
601
	        form.setAllowFolderSelection(allow);
610
	    }
602
	    }
611
	}
603
	}
604
	
605
    
612
}
606
}
(-)src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileSelectionInputProvider.java (-1 / +1 lines)
Lines 19-26 Link Here
19
19
20
import org.eclipse.rse.core.model.IHost;
20
import org.eclipse.rse.core.model.IHost;
21
import org.eclipse.rse.core.subsystems.ISubSystem;
21
import org.eclipse.rse.core.subsystems.ISubSystem;
22
import org.eclipse.rse.internal.ui.view.SystemResourceSelectionInputProvider;
23
import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility;
22
import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility;
23
import org.eclipse.rse.ui.view.SystemResourceSelectionInputProvider;
24
24
25
25
26
public class SystemRemoteFileSelectionInputProvider extends
26
public class SystemRemoteFileSelectionInputProvider extends
(-)src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileDialog.java (-4 / +4 lines)
Lines 23-31 Link Here
23
import org.eclipse.jface.viewers.IStructuredSelection;
23
import org.eclipse.jface.viewers.IStructuredSelection;
24
import org.eclipse.rse.core.model.IHost;
24
import org.eclipse.rse.core.model.IHost;
25
import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
25
import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
26
import org.eclipse.rse.internal.ui.view.SystemView;
27
import org.eclipse.rse.ui.SystemActionViewerFilter;
26
import org.eclipse.rse.ui.SystemActionViewerFilter;
28
import org.eclipse.rse.ui.dialogs.SystemRemoteResourceDialog;
27
import org.eclipse.rse.ui.dialogs.SystemRemoteResourceDialog;
28
import org.eclipse.rse.ui.view.ISystemTree;
29
import org.eclipse.swt.widgets.Composite;
29
import org.eclipse.swt.widgets.Composite;
30
import org.eclipse.swt.widgets.Control;
30
import org.eclipse.swt.widgets.Control;
31
import org.eclipse.swt.widgets.Shell;
31
import org.eclipse.swt.widgets.Shell;
Lines 70-76 Link Here
70
	protected Control createContents(Composite parent) 
70
	protected Control createContents(Composite parent) 
71
	{
71
	{
72
		Control control = super.createContents(parent);
72
		Control control = super.createContents(parent);
73
		_form.getSystemViewForm().getSystemView().addDoubleClickListener(new IDoubleClickListener() {
73
		getSystemTree().addDoubleClickListener(new IDoubleClickListener() {
74
			public void doubleClick(DoubleClickEvent event) {
74
			public void doubleClick(DoubleClickEvent event) {
75
				handleDoubleClick(event);
75
				handleDoubleClick(event);
76
			}
76
			}
Lines 84-95 Link Here
84
	 */
84
	 */
85
	protected void handleDoubleClick(DoubleClickEvent event) 
85
	protected void handleDoubleClick(DoubleClickEvent event) 
86
	{
86
	{
87
		SystemView tree = _form.getSystemViewForm().getSystemView();
87
		ISystemTree tree = getSystemTree();
88
		IStructuredSelection s = (IStructuredSelection) event.getSelection();
88
		IStructuredSelection s = (IStructuredSelection) event.getSelection();
89
		Object element = s.getFirstElement();
89
		Object element = s.getFirstElement();
90
		if (element == null)
90
		if (element == null)
91
			return;
91
			return;
92
		if (_form.isPageComplete() && !tree.isExpandable(element))
92
		if (isPageComplete() && !tree.isExpandable(element))
93
		{
93
		{
94
			setReturnCode(OK);
94
			setReturnCode(OK);
95
			if (processOK())
95
			if (processOK())
(-)src/org/eclipse/rse/internal/subsystems/files/core/SystemFileAPIProviderImpl.java (-1 / +1 lines)
Lines 21-29 Link Here
21
import org.eclipse.rse.core.model.IHost;
21
import org.eclipse.rse.core.model.IHost;
22
import org.eclipse.rse.core.model.ISystemRegistry;
22
import org.eclipse.rse.core.model.ISystemRegistry;
23
import org.eclipse.rse.core.subsystems.ISubSystem;
23
import org.eclipse.rse.core.subsystems.ISubSystem;
24
import org.eclipse.rse.internal.ui.view.SystemAbstractAPIProvider;
25
import org.eclipse.rse.subsystems.files.core.model.ISystemFileAPIProvider;
24
import org.eclipse.rse.subsystems.files.core.model.ISystemFileAPIProvider;
26
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
25
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
26
import org.eclipse.rse.ui.view.SystemAbstractAPIProvider;
27
27
28
28
29
/**
29
/**

Return to bug 225506