Attachment #61897 for bug #165565

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 29-39 Link Here

(-)src/org/eclipse/tptp/monitoring/managedagent/wsdm/internal/filter/MaxFilterPreference.java (-2 / +1 lines)
29		29
30	public static final String PREF_FILTERS = "FILTERS";	30	public static final String PREF_FILTERS = "FILTERS";
31		31
32	private String filePath = "D:\\Eclipse_Europa\\Workspace_From_13_Feb_07\\org.eclipse.tptp.monitoring.managedagent.ui\\filterPrefs.properties";
33		32
34	public MaxFilterPreference()	33	public MaxFilterPreference()
35	{	34	{
36	_prefs = new PreferenceStore(filePath);	35
37	}	36	}
38		37
39	public static void loadFilters()	38	public static void loadFilters()




import java.util.MissingResourceException;
import java.util.ResourceBundle;

public class Messages
{
	private static final String BUNDLE_NAME = "org.eclipse.tptp.monitoring.managedagent.wsdm.internal.filter.messages"; //$NON-NLS-1$

	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
			.getBundle(BUNDLE_NAME);

	private Messages()
	{
	}

	public static String getString(String key)
	{
		try
		{
			return RESOURCE_BUNDLE.getString(key);
		} catch (MissingResourceException e)
		{
			return '!' + key + '!';
		}
	}




 *******************************************************************************/
package org.eclipse.tptp.monitoring.managedagent.wsdm.provisional.filter;

import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.MenuItem;
import org.eclipse.swt.widgets.ToolBar;
import org.eclipse.swt.widgets.ToolItem;
import org.eclipse.tptp.monitoring.managedagent.internal.wsdm.ImageUtil;

import org.eclipse.tptp.monitoring.managedagent.ui.explorer.provisional.controller.BrowserViewContentProvider;
import org.eclipse.tptp.monitoring.managedagent.ui.explorer.provisional.controller.IBrowserNode;
import org.eclipse.tptp.monitoring.managedagent.ui.explorer.provisional.controller.ManagedResourceNode;
import org.eclipse.tptp.monitoring.managedagent.ui.explorer.provisional.filter.Comparator;
import org.eclipse.tptp.monitoring.managedagent.ui.explorer.provisional.filter.IFilterProvider;
import org.eclipse.tptp.monitoring.managedagent.wsdm.internal.filter.Filter;
import org.eclipse.tptp.monitoring.managedagent.wsdm.internal.filter.FilterDialog;
import org.eclipse.tptp.monitoring.managedagent.wsdm.internal.filter.FilterUtil;
import org.eclipse.tptp.monitoring.managedagent.wsdm.internal.filter.Messages;
import org.eclipse.ui.forms.widgets.FormToolkit;

public class WSDMAgentFilterProvider implements IFilterProvider 
{
	
	private boolean _sort = false;

	private Image _imgSort;

	private Image _imgFilter;

	private Image _imgUnSort;

	private MenuItem _miFilter;
	
	private ToolItem _tiSort;
	
	private FormToolkit _toolkit;
	
	//private MAExplorerView _view;
	
	private ToolItem _tiFilter;
	
	private TreeViewer _topologyViewer;
	
	private ViewerComparator _sorter;
	
	private BrowserViewContentProvider _topologyViewContentProvider;
	
	private Composite _sfComp;

	
	public WSDMAgentFilterProvider() 
	{
		//findAndSetMAXView();
		_sorter = new Comparator();
	}

	/* (non-Javadoc)

	public void setFilter(Object filter) 
	{
		if(filter instanceof Filter)
		{
			FilterUtil.setFilter((Filter)filter);
		}
		this._filter = filter;
	}
	
	/*private void addMenuItemSelectionListener() {
		_miFilter.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent se) {
				Filter filter = new FilterDialog().showWindow();
				if (filter == null) {
					return;
				}
				
				IBrowserNode root = _topologyViewContentProvider.getRoot();
				
				// if this is a service group then we can apply this filter
				// note that we do not check if it has members coz it might be an empty service group at this point and more members might be added later
				
				//System.out.println("root instanceof ManagedResourceNode = "+(root instanceof ManagedResourceNode));
				//System.out.println(root.getClass());
				Object[] children = root.getChildren();
				
				// the first child is what we want
				IBrowserNode child = null;
				try{
					child = (IBrowserNode) children[0];
				}catch(ArrayIndexOutOfBoundsException ae){
					
				}
				if(child != null
						&& child instanceof ManagedResourceNode){
					((ManagedResourceNode)child).setFilter(filter);
					((ManagedResourceNode)child).refresh();
					if (!MAExplorerView.filterMatches) {
						MessageDialog
								.openInformation(
										_topologyViewer.getControl().getShell(),
										Messages
												.getString("MAExplorerView.FILTER.TITILE.UI."),
										Messages
												.getString("MAExplorerView.FILTER.MESSAGE.UI."));
						//_topologyViewer.setInput(null);
					}
				}
				
				// this filtering must not be done here - it should be done by the ManagedResourceNode in figuring  out which of its children to show
				
				Object[] children = root.getChildren();
				for (int i = 0; i < children.length; i++) {
					root.removeChild((IBrowserNode) children[i]);
				}
				FilterUtil.setFilter(filter);
				System.out.println("FILTER STRING: " + filter.toString());
				ManagedResource[] resources = FilterUtil.getManagedResources();
				if (resources == null || resources.length<0) {
					return;
				}
				_topologyViewContentProvider.setFilterMatch(false);
				
				boolean match = _topologyViewContentProvider.getFilterMatch();
				if (!match) {
					MessageDialog
							.openInformation(
									_topologyViewer.getControl().getShell(),
									Messages
											.getString("MAExplorerView.FILTER.TITILE.UI."),
									Messages
											.getString("MAExplorerView.FILTER.MESSAGE.UI."));
					_topologyViewer.setInput(null);
				}
				
			}
		});
	}*/

	private void addToolItemSelectionListener() {
		_tiFilter.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent se) {

						&& child instanceof ManagedResourceNode){
					((ManagedResourceNode)child).setFilter(filter);
					((ManagedResourceNode)child).refresh();
					/*if (!MAExplorerView.filterMatches) {
						MessageDialog
								.openInformation(
										_topologyViewer.getControl().getShell(),
										Messages
												.getString("MAExplorerView.FILTER.TITILE.UI."),
										Messages
												.getString("MAExplorerView.FILTER.MESSAGE.UI."));
					}*/
				}
			}
		});
	}
	
	/* (non-Javadoc)
	 * @see org.eclipse.tptp.monitoring.managedagent.ui.explorer.provisional.filter.IFilterProvider#setBrowserViewContentProvider(org.eclipse.tptp.monitoring.managedagent.ui.explorer.provisional.controller.BrowserViewContentProvider)
	 */
	public void setBrowserViewContentProvider(BrowserViewContentProvider contentProvider)
	{
		if(contentProvider != null)
		{
			_topologyViewContentProvider = contentProvider;
			//_view.setFilterProvider(this);
		}
	}

	/* (non-Javadoc)
	 * @see org.eclipse.tptp.monitoring.managedagent.ui.explorer.provisional.filter.IFilterProvider#enableFiltering(boolean)
	 */
	public void enableFiltering(boolean enable) 
	{
		_tiFilter.setEnabled(enable);

Return to bug 165565

Lines 11-27 Link Here

(-)src/org/eclipse/tptp/monitoring/managedagent/wsdm/provisional/filter/WSDMAgentFilterProvider.java (-105 / +8 lines)
11	*******************************************************************************/	11	*******************************************************************************/
12	package org.eclipse.tptp.monitoring.managedagent.wsdm.provisional.filter;	12	package org.eclipse.tptp.monitoring.managedagent.wsdm.provisional.filter;
13		13
14	import org.eclipse.jface.viewers.TreeViewer;
15	import org.eclipse.jface.viewers.ViewerComparator;
16	import org.eclipse.swt.SWT;	14	import org.eclipse.swt.SWT;
17	import org.eclipse.swt.events.SelectionAdapter;	15	import org.eclipse.swt.events.SelectionAdapter;
18	import org.eclipse.swt.events.SelectionEvent;	16	import org.eclipse.swt.events.SelectionEvent;
19	import org.eclipse.swt.graphics.Image;	17	import org.eclipse.swt.graphics.Image;
20	import org.eclipse.swt.layout.FillLayout;	18	import org.eclipse.swt.layout.FillLayout;
21	import org.eclipse.swt.widgets.Composite;	19	import org.eclipse.swt.widgets.Composite;
22	import org.eclipse.swt.widgets.Control;
23	import org.eclipse.swt.widgets.Menu;
24	import org.eclipse.swt.widgets.MenuItem;
25	import org.eclipse.swt.widgets.ToolBar;	20	import org.eclipse.swt.widgets.ToolBar;
26	import org.eclipse.swt.widgets.ToolItem;	21	import org.eclipse.swt.widgets.ToolItem;
27	import org.eclipse.tptp.monitoring.managedagent.internal.wsdm.ImageUtil;	22	import org.eclipse.tptp.monitoring.managedagent.internal.wsdm.ImageUtil;
Lines 29-67 Link Here
29	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.provisional.controller.BrowserViewContentProvider;	24	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.provisional.controller.BrowserViewContentProvider;
30	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.provisional.controller.IBrowserNode;	25	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.provisional.controller.IBrowserNode;
31	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.provisional.controller.ManagedResourceNode;	26	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.provisional.controller.ManagedResourceNode;
32	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.provisional.filter.Comparator;
33	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.provisional.filter.IFilterProvider;	27	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.provisional.filter.IFilterProvider;
34	import org.eclipse.tptp.monitoring.managedagent.wsdm.internal.filter.Filter;	28	import org.eclipse.tptp.monitoring.managedagent.wsdm.internal.filter.Filter;
35	import org.eclipse.tptp.monitoring.managedagent.wsdm.internal.filter.FilterDialog;	29	import org.eclipse.tptp.monitoring.managedagent.wsdm.internal.filter.FilterDialog;
36	import org.eclipse.tptp.monitoring.managedagent.wsdm.internal.filter.FilterUtil;	30	import org.eclipse.tptp.monitoring.managedagent.wsdm.internal.filter.FilterUtil;
37	import org.eclipse.tptp.monitoring.managedagent.wsdm.internal.filter.Messages;
38	import org.eclipse.ui.forms.widgets.FormToolkit;	31	import org.eclipse.ui.forms.widgets.FormToolkit;
39		32
40	public class WSDMAgentFilterProvider implements IFilterProvider	33	public class WSDMAgentFilterProvider implements IFilterProvider
41	{	34	{
42		35
43	private boolean _sort = false;
44
45	private Image _imgSort;
46
47	private Image _imgFilter;	36	private Image _imgFilter;
48		37
49	private Image _imgUnSort;
50
51	private MenuItem _miFilter;
52
53	private ToolItem _tiSort;
54
55	private FormToolkit _toolkit;	38	private FormToolkit _toolkit;
56		39
57	//private MAExplorerView _view;
58
59	private ToolItem _tiFilter;	40	private ToolItem _tiFilter;
60		41
61	private TreeViewer _topologyViewer;
62
63	private ViewerComparator _sorter;
64
65	private BrowserViewContentProvider _topologyViewContentProvider;	42	private BrowserViewContentProvider _topologyViewContentProvider;
66		43
67	private Composite _sfComp;	44	private Composite _sfComp;
Lines 70-77 Link Here
70		47
71	public WSDMAgentFilterProvider()	48	public WSDMAgentFilterProvider()
72	{	49	{
73	//findAndSetMAXView();
74	_sorter = new Comparator();
75	}	50	}
76		51
77	/* (non-Javadoc)	52	/* (non-Javadoc)
Lines 113-192 Link Here
113	public void setFilter(Object filter)	88	public void setFilter(Object filter)
114	{	89	{
115	if(filter instanceof Filter)	90	if(filter instanceof Filter)
		91	{
116	FilterUtil.setFilter((Filter)filter);	92	FilterUtil.setFilter((Filter)filter);
		93	}
117	this._filter = filter;	94	this._filter = filter;
118	}	95	}
119		96
120	/*private void addMenuItemSelectionListener() {
121	_miFilter.addSelectionListener(new SelectionAdapter() {
122	public void widgetSelected(SelectionEvent se) {
123	Filter filter = new FilterDialog().showWindow();
124	if (filter == null) {
125	return;
126	}
127
128	IBrowserNode root = _topologyViewContentProvider.getRoot();
129
130	// if this is a service group then we can apply this filter
131	// note that we do not check if it has members coz it might be an empty service group at this point and more members might be added later
132
133	//System.out.println("root instanceof ManagedResourceNode = "+(root instanceof ManagedResourceNode));
134	//System.out.println(root.getClass());
135	Object[] children = root.getChildren();
136
137	// the first child is what we want
138	IBrowserNode child = null;
139	try{
140	child = (IBrowserNode) children[0];
141	}catch(ArrayIndexOutOfBoundsException ae){
142
143	}
144	if(child != null
145	&& child instanceof ManagedResourceNode){
146	((ManagedResourceNode)child).setFilter(filter);
147	((ManagedResourceNode)child).refresh();
148	if (!MAExplorerView.filterMatches) {
149	MessageDialog
150	.openInformation(
151	_topologyViewer.getControl().getShell(),
152	Messages
153	.getString("MAExplorerView.FILTER.TITILE.UI."),
154	Messages
155	.getString("MAExplorerView.FILTER.MESSAGE.UI."));
156	//_topologyViewer.setInput(null);
157	}
158	}
159
160	// this filtering must not be done here - it should be done by the ManagedResourceNode in figuring out which of its children to show
161
162	Object[] children = root.getChildren();
163	for (int i = 0; i < children.length; i++) {
164	root.removeChild((IBrowserNode) children[i]);
165	}
166	FilterUtil.setFilter(filter);
167	System.out.println("FILTER STRING: " + filter.toString());
168	ManagedResource[] resources = FilterUtil.getManagedResources();
169	if (resources == null \|\| resources.length<0) {
170	return;
171	}
172	_topologyViewContentProvider.setFilterMatch(false);
173
174	boolean match = _topologyViewContentProvider.getFilterMatch();
175	if (!match) {
176	MessageDialog
177	.openInformation(
178	_topologyViewer.getControl().getShell(),
179	Messages
180	.getString("MAExplorerView.FILTER.TITILE.UI."),
181	Messages
182	.getString("MAExplorerView.FILTER.MESSAGE.UI."));
183	_topologyViewer.setInput(null);
184	}
185
186	}
187	});
188	}*/
189
190	private void addToolItemSelectionListener() {	97	private void addToolItemSelectionListener() {
191	_tiFilter.addSelectionListener(new SelectionAdapter() {	98	_tiFilter.addSelectionListener(new SelectionAdapter() {
192	public void widgetSelected(SelectionEvent se) {	99	public void widgetSelected(SelectionEvent se) {
Lines 206-234 Link Here
206	&& child instanceof ManagedResourceNode){	113	&& child instanceof ManagedResourceNode){
207	((ManagedResourceNode)child).setFilter(filter);	114	((ManagedResourceNode)child).setFilter(filter);
208	((ManagedResourceNode)child).refresh();	115	((ManagedResourceNode)child).refresh();
209	/*if (!MAExplorerView.filterMatches) {
210	MessageDialog
211	.openInformation(
212	_topologyViewer.getControl().getShell(),
213	Messages
214	.getString("MAExplorerView.FILTER.TITILE.UI."),
215	Messages
216	.getString("MAExplorerView.FILTER.MESSAGE.UI."));
217	}*/
218	}	116	}
219	}	117	}
220	});	118	});
221	}	119	}
222		120
		121	/* (non-Javadoc)
		122	* @see org.eclipse.tptp.monitoring.managedagent.ui.explorer.provisional.filter.IFilterProvider#setBrowserViewContentProvider(org.eclipse.tptp.monitoring.managedagent.ui.explorer.provisional.controller.BrowserViewContentProvider)
		123	*/
223	public void setBrowserViewContentProvider(BrowserViewContentProvider contentProvider)	124	public void setBrowserViewContentProvider(BrowserViewContentProvider contentProvider)
224	{	125	{
225	if(contentProvider != null)	126	if(contentProvider != null)
226	{	127	{
227	_topologyViewContentProvider = contentProvider;	128	_topologyViewContentProvider = contentProvider;
228	//_view.setFilterProvider(this);
229	}	129	}
230	}	130	}
231		131
		132	/* (non-Javadoc)
		133	* @see org.eclipse.tptp.monitoring.managedagent.ui.explorer.provisional.filter.IFilterProvider#enableFiltering(boolean)
		134	*/
232	public void enableFiltering(boolean enable)	135	public void enableFiltering(boolean enable)
233	{	136	{
234	_tiFilter.setEnabled(enable);	137	_tiFilter.setEnabled(enable);

Lines 14-32 Link Here

(-)src/org/eclipse/tptp/monitoring/managedagent/wsdm/internal/filter/Messages.java (-6 / +11 lines)
14	import java.util.MissingResourceException;	14	import java.util.MissingResourceException;
15	import java.util.ResourceBundle;	15	import java.util.ResourceBundle;
16		16
17	public class Messages {	17	public class Messages
18	private static final String BUNDLE_NAME = "org.eclipse.tptp.monitoring.managedagent.internal.wsdm.filter.messages"; //$NON-NLS-1$	18	{
		19	private static final String BUNDLE_NAME = "org.eclipse.tptp.monitoring.managedagent.wsdm.internal.filter.messages"; //$NON-NLS-1$
19		20
20	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle	21	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
21	.getBundle(BUNDLE_NAME);	22	.getBundle(BUNDLE_NAME);
22		23
23	private Messages() {	24	private Messages()
		25	{
24	}	26	}
25		27
26	public static String getString(String key) {	28	public static String getString(String key)
27	try {	29	{
		30	try
		31	{
28	return RESOURCE_BUNDLE.getString(key);	32	return RESOURCE_BUNDLE.getString(key);
29	} catch (MissingResourceException e) {	33	} catch (MissingResourceException e)
		34	{
30	return '!' + key + '!';	35	return '!' + key + '!';
31	}	36	}
32	}	37	}