Attachment #61379 for bug #165565

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




import org.eclipse.tptp.monitoring.managedagent.provisional.model.Relationship;
import org.eclipse.tptp.monitoring.managedagent.provisional.model.ResourceStates;
import org.eclipse.tptp.monitoring.managedagent.provisional.model.util.ModelUtils;
import org.eclipse.tptp.monitoring.managedagent.ui.explorer.filter.IFilterProvider;
import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.ActionManager;
import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.ManagedAgentUIPlugin;
import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.filter.Filter;


	private String _agentId = null;
	
	private Object _filter = null;
	
	private ManagedAgentCommandHelper _agent = null;


		notifyProvider();
	}
	
	public void setFilter(Object filter){
		_filter = filter;
	}


	protected void performStructuralChanges(){
		// TODO should we synchronize on FilterUtil or an instance of it
		List members = _resource.getMembers();
		
			FilterUtil.setFilter(_filter);
			MAExplorerView.filterMatches = false;
			System.out.println("FILTER STRING: " + _filter.toString());
		}

		if (members != null && members.size() != 0) {
			Iterator i = _resource.getMembers().iterator();
			MAExplorerView.filterMatches = false;
			while (i.hasNext()) {
				ManagedResource member = (ManagedResource) i.next();
				

				
				if( _filter != null)
				{
					String agentType = ModelUtils.extractFromConnProperties(member.getConnectionProperties(), ManagedAgentFactory.MANAGED_AGENT_TYPE);
					IFilterProvider currentFilterProvider = MAExplorerView.getFilterProviderForAgentType(agentType);
					if(currentFilterProvider != null)
					{
						currentFilterProvider.setFilter(_filter);
						boolean match = currentFilterProvider.matchFilter(member);
						if(match)
							MAExplorerView.filterMatches = true;
						else
							continue;
					}
				}	
				
				ManagedResourceNode memberNode = new ManagedResourceNode(_provider, this, member);

Lines 18-25 Link Here

(-)src/org/eclipse/tptp/monitoring/managedagent/ui/explorer/provisional/controller/BrowserViewContentProvider.java (-6 / +21 lines)
18	import org.eclipse.jface.viewers.ITreeContentProvider;	18	import org.eclipse.jface.viewers.ITreeContentProvider;
19	import org.eclipse.jface.viewers.TreeViewer;	19	import org.eclipse.jface.viewers.TreeViewer;
20	import org.eclipse.jface.viewers.Viewer;	20	import org.eclipse.jface.viewers.Viewer;
		21	import org.eclipse.tptp.monitoring.managedagent.provisional.ManagedAgentFactory;
21	import org.eclipse.tptp.monitoring.managedagent.provisional.helper.ManagedAgentCommandHelper;	22	import org.eclipse.tptp.monitoring.managedagent.provisional.helper.ManagedAgentCommandHelper;
22	import org.eclipse.tptp.monitoring.managedagent.provisional.model.ManagedResource;	23	import org.eclipse.tptp.monitoring.managedagent.provisional.model.ManagedResource;
		24	import org.eclipse.tptp.monitoring.managedagent.provisional.model.ModelPackage;
		25	import org.eclipse.tptp.monitoring.managedagent.provisional.model.util.ModelUtils;
		26	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.filter.IFilterProvider;
23	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.ManagedAgentUIPlugin;	27	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.ManagedAgentUIPlugin;
24	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.adapters.IModelChangeAdapter;	28	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.adapters.IModelChangeAdapter;
25	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.adapters.PropertyChangeModelAdapter;	29	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.adapters.PropertyChangeModelAdapter;
Lines 100-106 Link Here
100		104
101	mac.getManagedResource().eAdapters().add(this);	105	mac.getManagedResource().eAdapters().add(this);
102		106
103	enableOrDisableSortAndFilter(mac.getManagedResource());	107	ManagedResource mr = mac.getManagedResource();
		108
		109	enableOrDisableSortAndFilter(mr);
		110
		111
104		112
105	//Apply Filter Here. if this managed resource satisfies the filter, then add the node	113	//Apply Filter Here. if this managed resource satisfies the filter, then add the node
106	/*if(FilterUtil.getFilter() != null)	114	/*if(FilterUtil.getFilter() != null)
Lines 177-188 Link Here
177	}	185	}
178	}	186	}
179		187
		188	String agentType = ModelUtils.extractFromConnProperties(mr.getConnectionProperties(), ManagedAgentFactory.MANAGED_AGENT_TYPE);
180	if(view != null){	189	if(view != null){
181	EList members = mr.getMembers();	190	IFilterProvider filterProvider = MAExplorerView.getFilterProviderForAgentType(agentType);
182	if(members == null \|\| members.size() == 0)	191	if(filterProvider != null)
183	view.disableFilterAndSorting();	192	view.setFilterProvider(filterProvider);
184	else	193	if(agentType.equals("WSDM"))
185	view.enableFilterAndSorting();	194	{
		195	EList members = mr.getMembers();
		196	if(members == null \|\| members.size() == 0)
		197	view.disableFilterAndSorting();
		198	else
		199	view.enableFilterAndSorting();
		200	}
186	}	201	}
187	}	202	}
188		203

Lines 11-16 Link Here

(-)src/org/eclipse/tptp/monitoring/managedagent/ui/explorer/internal/ui/MAExplorerView.java (-150 / +80 lines)
11	*******************************************************************************/	11	*******************************************************************************/
12	package org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.ui;	12	package org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.ui;
13		13
		14	import java.util.Hashtable;
		15
		16	import org.eclipse.core.runtime.IConfigurationElement;
		17	import org.eclipse.core.runtime.IExtension;
		18	import org.eclipse.core.runtime.Platform;
14	import org.eclipse.hyades.models.hierarchy.TRCAgentProxy;	19	import org.eclipse.hyades.models.hierarchy.TRCAgentProxy;
15	import org.eclipse.jface.action.Action;	20	import org.eclipse.jface.action.Action;
16	import org.eclipse.jface.action.IMenuListener;	21	import org.eclipse.jface.action.IMenuListener;
Lines 21-26 Link Here
21	import org.eclipse.jface.dialogs.MessageDialog;	26	import org.eclipse.jface.dialogs.MessageDialog;
22	import org.eclipse.jface.viewers.CellEditor;	27	import org.eclipse.jface.viewers.CellEditor;
23	import org.eclipse.jface.viewers.DecoratingLabelProvider;	28	import org.eclipse.jface.viewers.DecoratingLabelProvider;
		29	import org.eclipse.jface.viewers.IContentProvider;
24	import org.eclipse.jface.viewers.ISelection;	30	import org.eclipse.jface.viewers.ISelection;
25	import org.eclipse.jface.viewers.ISelectionChangedListener;	31	import org.eclipse.jface.viewers.ISelectionChangedListener;
26	import org.eclipse.jface.viewers.IStructuredSelection;	32	import org.eclipse.jface.viewers.IStructuredSelection;
Lines 28-34 Link Here
28	import org.eclipse.jface.viewers.TableViewer;	34	import org.eclipse.jface.viewers.TableViewer;
29	import org.eclipse.jface.viewers.TextCellEditor;	35	import org.eclipse.jface.viewers.TextCellEditor;
30	import org.eclipse.jface.viewers.TreeViewer;	36	import org.eclipse.jface.viewers.TreeViewer;
31	import org.eclipse.jface.viewers.ViewerComparator;
32	import org.eclipse.swt.SWT;	37	import org.eclipse.swt.SWT;
33	import org.eclipse.swt.custom.CTabFolder;	38	import org.eclipse.swt.custom.CTabFolder;
34	import org.eclipse.swt.custom.CTabItem;	39	import org.eclipse.swt.custom.CTabItem;
Lines 36-72 Link Here
36	import org.eclipse.swt.events.ModifyListener;	41	import org.eclipse.swt.events.ModifyListener;
37	import org.eclipse.swt.events.SelectionAdapter;	42	import org.eclipse.swt.events.SelectionAdapter;
38	import org.eclipse.swt.events.SelectionEvent;	43	import org.eclipse.swt.events.SelectionEvent;
39	import org.eclipse.swt.graphics.Image;
40	import org.eclipse.swt.graphics.Point;
41	import org.eclipse.swt.graphics.Rectangle;
42	import org.eclipse.swt.layout.FillLayout;	44	import org.eclipse.swt.layout.FillLayout;
43	import org.eclipse.swt.layout.GridData;	45	import org.eclipse.swt.layout.GridData;
44	import org.eclipse.swt.layout.GridLayout;	46	import org.eclipse.swt.layout.GridLayout;
45	import org.eclipse.swt.widgets.Button;	47	import org.eclipse.swt.widgets.Button;
46	import org.eclipse.swt.widgets.Composite;	48	import org.eclipse.swt.widgets.Composite;
47	import org.eclipse.swt.widgets.Menu;	49	import org.eclipse.swt.widgets.Menu;
48	import org.eclipse.swt.widgets.MenuItem;
49	import org.eclipse.swt.widgets.Table;	50	import org.eclipse.swt.widgets.Table;
50	import org.eclipse.swt.widgets.TableColumn;	51	import org.eclipse.swt.widgets.TableColumn;
51	import org.eclipse.swt.widgets.TableItem;	52	import org.eclipse.swt.widgets.TableItem;
52	import org.eclipse.swt.widgets.Text;	53	import org.eclipse.swt.widgets.Text;
53	import org.eclipse.swt.widgets.ToolBar;	54	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.filter.IFilterProvider;
54	import org.eclipse.swt.widgets.ToolItem;
55	import org.eclipse.swt.widgets.Tree;
56	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.ManagedAgentUIPlugin;	55	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.ManagedAgentUIPlugin;
57	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.editor.PropertiesCellModifier;	56	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.editor.PropertiesCellModifier;
58	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.editor.PropertiesViewContentProvider;	57	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.editor.PropertiesViewContentProvider;
59	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.editor.PropertiesViewLabelProvider;	58	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.editor.PropertiesViewLabelProvider;
60	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.filter.Comparator;
61	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.filter.Filter;
62	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.filter.FilterDialog;
63	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.filter.MaxFilterPreference;	59	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.filter.MaxFilterPreference;
64	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.util.ImageUtil;	60	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.util.ImageUtil;
65	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.provisional.controller.BrowserLabelProvider;	61	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.provisional.controller.BrowserLabelProvider;
66	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.provisional.controller.BrowserViewContentProvider;	62	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.provisional.controller.BrowserViewContentProvider;
67	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.provisional.controller.IBrowserNode;	63	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.provisional.controller.IBrowserNode;
68	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.provisional.controller.IViewContributor;	64	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.provisional.controller.IViewContributor;
69	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.provisional.controller.ManagedResourceNode;
70	import org.eclipse.ui.IWorkbenchActionConstants;	65	import org.eclipse.ui.IWorkbenchActionConstants;
71	import org.eclipse.ui.PlatformUI;	66	import org.eclipse.ui.PlatformUI;
72	import org.eclipse.ui.forms.widgets.FormToolkit;	67	import org.eclipse.ui.forms.widgets.FormToolkit;
Lines 85-90 Link Here
85	public static final String ID = "org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.ui.MAExplorerView"; //$NON-NLS-1$	80	public static final String ID = "org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.ui.MAExplorerView"; //$NON-NLS-1$
86		81
87	private static final int DEFAULT_PADDING = 5;	82	private static final int DEFAULT_PADDING = 5;
		83
		84	public static final String FILTER_EXT_PT = "maxFilter";
88		85
89	/**	86	/**
90	* The widget that shows our tree view	87	* The widget that shows our tree view
Lines 115-135 Link Here
115		112
116	private static MAExplorerView _default = null;	113	private static MAExplorerView _default = null;
117		114
118	private ViewerComparator _sorter;	115	public static boolean filterMatches = true;
119
120	private boolean _sort = false;
121
122	private Image _imgSort;
123
124	private Image _imgFilter;
125
126	private Image _imgUnSort;
127
128	private MenuItem _miFilter;
129		116
130	private ToolItem _tiSort;	117	private IFilterProvider _filterProvider;
131		118
132	public static boolean filterMatches = true;	119	private Section _topologySection;
		120
		121	private static Hashtable _filterProviders = new Hashtable();
133		122
134	/**	123	/**
135	* The constructor.	124	* The constructor.
Lines 166-171 Link Here
166		155
167	layoutAgentTopologyTree();	156	layoutAgentTopologyTree();
168	layoutDataPanels();	157	layoutDataPanels();
		158	loadFilterExtensions();
169	}	159	}
170		160
171	private void layoutDataPanels() {	161	private void layoutDataPanels() {
Lines 387-405 Link Here
387		377
388	parent.setLayout(layout);	378	parent.setLayout(layout);
389		379
390	Section label = _toolkit.createSection(parent, Section.TITLE_BAR);	380	_topologySection = _toolkit.createSection(parent, Section.TITLE_BAR);
391	label.setText(Messages	381	_topologySection.setText(Messages
392	.getString("MAExplorerView.RESOURCE_TOPOLOGY.UI.")); //$NON-NLS-1$	382	.getString("MAExplorerView.RESOURCE_TOPOLOGY.UI.")); //$NON-NLS-1$
393	GridData gd = new GridData();	383	GridData gd = new GridData();
394	gd.grabExcessHorizontalSpace = true;	384	gd.grabExcessHorizontalSpace = true;
395	gd.grabExcessVerticalSpace = false;	385	gd.grabExcessVerticalSpace = false;
396	gd.horizontalAlignment = SWT.FILL;	386	gd.horizontalAlignment = SWT.FILL;
397	label.setLayoutData(gd);	387	_topologySection.setLayoutData(gd);
398		388
399	_sorter = new Comparator();
400	addSortAndFilterToolBar(label);
401	disableFilterAndSorting();
402
403	_topologyViewer = new TreeViewer(parent);	389	_topologyViewer = new TreeViewer(parent);
404		390
405	gd = new GridData();	391	gd = new GridData();
Lines 500-624 Link Here
500	}	486	}
501		487
502	private void addSortAndFilterToolBar(Section label) {	488	private void addSortAndFilterToolBar(Section label) {
503	Composite sfComp = _toolkit.createComposite(label);	489	if(_filterProvider == null)
504	sfComp.setLayout(new FillLayout());	490	{
505	ToolBar tb = new ToolBar(sfComp, SWT.NONE);	491	return;
506	_tiSort = new ToolItem(tb, SWT.DROP_DOWN);	492	}
507	_imgSort = ImageUtil.getImage(ImageUtil.SORT_IMAGE);	493	Composite sfComp = _filterProvider.createFilterUI(label);
508	_tiSort.setImage(_imgSort);	494	if(sfComp == null)
509		495	{
510	_imgUnSort = ImageUtil.getImage(ImageUtil.UNSORT_IMAGE);	496	return;
511		497	}
512	Menu ddMenu = new Menu(_tiSort.getParent().getShell(), SWT.NONE);
513	_miFilter = new MenuItem(ddMenu, SWT.NONE);
514	_imgFilter = ImageUtil.getImage(ImageUtil.FILTER_IMAGE);
515	_miFilter.setImage(_imgFilter);
516	_miFilter.setText(Messages.getString("MAExplorerView.FILTER.UI."));
517
518	addMenuItemSelectionListener();
519	addToolItemSelectionListener(_tiSort, ddMenu);
520
521	_toolkit.adapt(sfComp);	498	_toolkit.adapt(sfComp);
522	label.setTextClient(sfComp);	499	label.setTextClient(sfComp);
		500	label.layout(true);
523	}	501	}
524		502
525	private void addMenuItemSelectionListener() {	503
526	_miFilter.addSelectionListener(new SelectionAdapter() {
527	public void widgetSelected(SelectionEvent se) {
528	Filter filter = new FilterDialog().showWindow();
529	if (filter == null) {
530	return;
531	}
532
533	IBrowserNode root = _topologyViewContentProvider.getRoot();
534
535	// if this is a service group then we can apply this filter
536	// 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
537
538	System.out.println("root instanceof ManagedResourceNode = "+(root instanceof ManagedResourceNode));
539	System.out.println(root.getClass());
540	Object[] children = root.getChildren();
541
542	// the first child is what we want
543	IBrowserNode child = null;
544	try{
545	child = (IBrowserNode) children[0];
546	}catch(ArrayIndexOutOfBoundsException ae){
547
548	}
549	if(child != null
550	&& child instanceof ManagedResourceNode){
551	((ManagedResourceNode)child).setFilter(filter);
552	((ManagedResourceNode)child).refresh();
553	if (!filterMatches) {
554	MessageDialog
555	.openInformation(
556	_topologyViewer.getControl().getShell(),
557	Messages
558	.getString("MAExplorerView.FILTER.TITILE.UI."),
559	Messages
560	.getString("MAExplorerView.FILTER.MESSAGE.UI."));
561	//_topologyViewer.setInput(null);
562	}
563	}
564
565	// this filtering must not be done here - it should be done by the ManagedResourceNode in figuring out which of its children to show
566	/*
567	Object[] children = root.getChildren();
568	for (int i = 0; i < children.length; i++) {
569	root.removeChild((IBrowserNode) children[i]);
570	}
571	FilterUtil.setFilter(filter);
572	System.out.println("FILTER STRING: " + filter.toString());
573	ManagedResource[] resources = FilterUtil.getManagedResources();
574	if (resources == null \|\| resources.length<0) {
575	return;
576	}
577	_topologyViewContentProvider.setFilterMatch(false);
578
579	boolean match = _topologyViewContentProvider.getFilterMatch();
580	if (!match) {
581	MessageDialog
582	.openInformation(
583	_topologyViewer.getControl().getShell(),
584	Messages
585	.getString("MAExplorerView.FILTER.TITILE.UI."),
586	Messages
587	.getString("MAExplorerView.FILTER.MESSAGE.UI."));
588	_topologyViewer.setInput(null);
589	}
590	*/
591	}
592	});
593	}
594
595	private void addToolItemSelectionListener(ToolItem ti, final Menu ddMenu) {
596	ti.addSelectionListener(new SelectionAdapter() {
597	public void widgetSelected(SelectionEvent se) {
598	ToolItem item = (ToolItem) se.widget;
599	if (se.detail == SWT.ARROW) {
600	// Determine where to put the dropdown list
601	Rectangle rect = item.getBounds();
602	Point pt = item.getParent().toDisplay(
603	new Point(rect.x, rect.y));
604	ddMenu.setLocation(pt.x, pt.y + rect.height);
605	ddMenu.setVisible(true);
606	} else {
607	_sort = !_sort;
608	if (_sort) {
609	item.setImage(_imgUnSort);
610	Tree tree = _topologyViewer.getTree();
611	if (tree != null) {
612	_topologyViewer.setComparator(_sorter);
613	}
614	} else {
615	item.setImage(_imgSort);
616	_topologyViewer.setComparator(null);
617	}
618	}
619	}
620	});
621	}
622		504
623	private void makeActions() {	505	private void makeActions() {
624	_refreshPropertiesAction = new Action() {	506	_refreshPropertiesAction = new Action() {
Lines 669-680 Link Here
669		551
670	public void disableFilterAndSorting()	552	public void disableFilterAndSorting()
671	{	553	{
672	_tiSort.setEnabled(false);	554	if(_filterProvider != null)
		555	_filterProvider.enableFiltering(false);
673	}	556	}
674		557
675	public void enableFilterAndSorting()	558	public void enableFilterAndSorting()
676	{	559	{
677	_tiSort.setEnabled(true);	560	if(_filterProvider != null)
		561	_filterProvider.enableFiltering(true);
678	}	562	}
679		563
		564	public void setFilterProvider(IFilterProvider provider)
		565	{
		566	this._filterProvider = provider;
		567	addSortAndFilterToolBar(_topologySection);
		568	disableFilterAndSorting();
		569	}
		570
		571	public IFilterProvider getFilterProvider()
		572	{
		573	return this._filterProvider;
		574	}
		575
		576	public IContentProvider getContentProvider()
		577	{
		578	return _topologyViewContentProvider;
		579	}
		580
		581	private void loadFilterExtensions()
		582	{
		583	_filterProviders = new Hashtable();
		584	IExtension[] exts = Platform.getExtensionRegistry().getExtensionPoint(ManagedAgentUIPlugin.PLUGIN_ID, FILTER_EXT_PT).getExtensions();
		585	if(exts == null \|\| exts.length == 0)
		586	return;
		587	for (int i = 0; i < exts.length; ++i) {
		588	IConfigurationElement[] elements = exts[i].getConfigurationElements();
		589	for (int j = 0; j < elements.length; ++j) {
		590	if ("MAXFilter".equals(elements[j].getName())) { //$NON-NLS-1$
		591	try {
		592	IFilterProvider helper = (IFilterProvider) elements[j].createExecutableExtension("providerClass"); //$NON-NLS-1$
		593	helper.setMAXView(this);
		594	String type = elements[j].getAttribute("agentType"); //$NON-NLS-1$
		595	//System.out.println("PC = " + elements[j].getAttribute("providerClass"));
		596	_filterProviders.put(type, helper);
		597	} catch (Exception e) {
		598	e.printStackTrace();
		599	}
		600	}
		601	}
		602	}
		603	}
		604
		605	public static IFilterProvider getFilterProviderForAgentType(String agentType)
		606	{
		607	return (IFilterProvider) _filterProviders.get(agentType);
		608	}
		609
680	}	610	}




   <extension-point id="selectionListener" name="Selection Listener" schema="schema/selectionListener.exsd"/>
      <extension-point id="actionProvider" name="Context menu action provider" schema="schema/actionProvider.exsd"/>
      <extension-point id="connectionHelper" name="connectionHelper" schema="schema/connectionHelper.exsd"/>
      <extension-point id="maxFilter" name="maxFilter" schema="schema/maxFilter.exsd"/>
	<!-- sbalan
   <extension-point id="changeBroker" name="ChangeBroker" schema="schema/changeBroker.exsd"/>
   -->

         point="org.eclipse.ui.startup">
      <startup class="org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.ManagedAgentUIPlugin"/>
   </extension>
    <extension
          point="org.eclipse.tptp.monitoring.managedagent.ui.maxFilter"
          name="MAXFilter">
       <MAXFilter
             agentType="WSDM"
             providerClass="org.eclipse.tptp.monitoring.managedagent.ui.explorer.filter.WSDMAgentFilterProvider">
       </MAXFilter>
    </extension>
    <extension
          point="org.eclipse.tptp.monitoring.managedagent.ui.maxFilter"
          name="MAXFilter">
       <MAXFilter
             agentType="JMX"
             providerClass="org.eclipse.tptp.monitoring.managedagent.ui.explorer.filter.JMXAgentFilterProvider">
       </MAXFilter>
    </extension>
    <!-- sbalan
    <extension
          point="org.eclipse.tptp.monitoring.managedagent.ui.changeBroker">




<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
<schema targetNamespace="org.eclipse.tptp.monitoring.managedagent.ui">
<annotation>
      <appInfo>
         <meta.schema plugin="org.eclipse.tptp.monitoring.managedagent.ui" id="maxFilter" name="maxFilter"/>
      </appInfo>
      <documentation>
         [Enter description of this extension point.]
      </documentation>
   </annotation>

   <element name="extension">
      <complexType>
         <sequence>
            <element ref="MAXFilter"/>
         </sequence>
         <attribute name="point" type="string" use="required">
            <annotation>
               <documentation>
                  
               </documentation>
            </annotation>
         </attribute>
         <attribute name="id" type="string">
            <annotation>
               <documentation>
                  
               </documentation>
            </annotation>
         </attribute>
         <attribute name="name" type="string">
            <annotation>
               <documentation>
                  
               </documentation>
               <appInfo>
                  <meta.attribute translatable="true"/>
               </appInfo>
            </annotation>
         </attribute>
      </complexType>
   </element>

   <element name="MAXFilter">
      <complexType>
         <attribute name="agentType" type="string" use="required">
            <annotation>
               <documentation>
                  This attribute specifies for which type of agent this filter is provided.
               </documentation>
            </annotation>
         </attribute>
         <attribute name="providerClass" type="string" use="required">
            <annotation>
               <documentation>
                  This class should implement IFilterProvider interface.
               </documentation>
               <appInfo>
                  <meta.attribute kind="java" basedOn="org.eclipse.tptp.monitoring.managedagent.ui.explorer.filter.IFilterProvider"/>
               </appInfo>
            </annotation>
         </attribute>
      </complexType>
   </element>

   <annotation>
      <appInfo>
         <meta.section type="since"/>
      </appInfo>
      <documentation>
         [Enter the first release in which this extension point appears.]
      </documentation>
   </annotation>

   <annotation>
      <appInfo>
         <meta.section type="examples"/>
      </appInfo>
      <documentation>
         [Enter extension point usage example here.]
      </documentation>
   </annotation>

   <annotation>
      <appInfo>
         <meta.section type="apiInfo"/>
      </appInfo>
      <documentation>
         [Enter API information here.]
      </documentation>
   </annotation>

   <annotation>
      <appInfo>
         <meta.section type="implementation"/>
      </appInfo>
      <documentation>
         [Enter information about supplied implementation of this extension point.]
      </documentation>
   </annotation>

   <annotation>
      <appInfo>
         <meta.section type="copyright"/>
      </appInfo>
      <documentation>
         
      </documentation>
   </annotation>

</schema>




/**
 * 
 */
package org.eclipse.tptp.monitoring.managedagent.ui.explorer.filter;

import org.eclipse.jface.dialogs.MessageDialog;
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.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
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.swt.widgets.Tree;
import org.eclipse.tptp.monitoring.managedagent.provisional.model.ManagedResource;
import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.filter.Comparator;
import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.filter.Filter;
import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.filter.FilterDialog;
import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.filter.FilterUtil;
import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.ui.MAExplorerView;
import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.ui.Messages;
import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.util.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.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 TreeViewer _topologyViewer;
	
	private ViewerComparator _sorter;
	
	private BrowserViewContentProvider _topologyViewContentProvider;
	
	private Composite _sfComp;
	
	private Object _filter;
	
	public WSDMAgentFilterProvider() 
	{
		//findAndSetMAXView();
		_sorter = new Comparator();
	}

	/* (non-Javadoc)
	 * @see org.eclipse.tptp.monitoring.managedagent.ui.explorer.filter.IFilterProvider#createFilterUI(org.eclipse.swt.widgets.Composite)
	 */
	public Composite createFilterUI(Composite parent) 
	{
		_toolkit = new FormToolkit(parent.getDisplay());
		_sfComp = _toolkit.createComposite(parent);
		_sfComp.setLayout(new FillLayout());
		ToolBar tb = new ToolBar(_sfComp, SWT.NONE);
		_tiSort = new ToolItem(tb, SWT.DROP_DOWN);
		_imgSort = ImageUtil.getImage(ImageUtil.SORT_IMAGE);
		_tiSort.setImage(_imgSort);

		_imgUnSort = ImageUtil.getImage(ImageUtil.UNSORT_IMAGE);

		Menu ddMenu = new Menu(_tiSort.getParent().getShell(), SWT.NONE);
		_miFilter = new MenuItem(ddMenu, SWT.NONE);
		_imgFilter = ImageUtil.getImage(ImageUtil.FILTER_IMAGE);
		_miFilter.setImage(_imgFilter);
		_miFilter.setText(Messages.getString("MAExplorerView.FILTER.UI."));

		addMenuItemSelectionListener();
		addToolItemSelectionListener(_tiSort, ddMenu);
		return _sfComp;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.tptp.monitoring.managedagent.ui.explorer.filter.IFilterProvider#getFilter()
	 */
	public Object getFilter() 
	{
		return this._filter;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.tptp.monitoring.managedagent.ui.explorer.filter.IFilterProvider#matchFilter(java.lang.Object)
	 */
	public boolean matchFilter(Object resource) 
	{
		return FilterUtil.matchFilter((ManagedResource) resource);
	}

	/* (non-Javadoc)
	 * @see org.eclipse.tptp.monitoring.managedagent.ui.explorer.filter.IFilterProvider#setFilter(java.lang.Object)
	 */
	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(ToolItem ti, final Menu ddMenu) {
		ti.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent se) {
				ToolItem item = (ToolItem) se.widget;
				if (se.detail == SWT.ARROW) {
					// Determine where to put the dropdown list
					Rectangle rect = item.getBounds();
					Point pt = item.getParent().toDisplay(
							new Point(rect.x, rect.y));
					ddMenu.setLocation(pt.x, pt.y + rect.height);
					ddMenu.setVisible(true);
				} else {
					_sort = !_sort;
					if (_sort) {
						item.setImage(_imgUnSort);
						Tree tree = _topologyViewer.getTree();
						if (tree != null) {
							_topologyViewer.setComparator(_sorter);
						}
					} else {
						item.setImage(_imgSort);
						_topologyViewer.setComparator(null);
					}
				}
			}
		});
	}
	
	public void setMAXView(MAExplorerView maxView)
	{
		if(maxView != null)
		{
			_view = maxView;
			_topologyViewer = _view.getTopologyViewer();
			_topologyViewContentProvider = (BrowserViewContentProvider) _view.getContentProvider();
			//_view.setFilterProvider(this);
		}
	}

	public void enableFiltering(boolean enable) 
	{
		_sfComp.setEnabled(enable);
		Control controls[] = _sfComp.getChildren();
		if(controls == null || controls.length == 0)
			return;
		for(int i = 0; i < controls.length; i++)
		{
			controls[i].setEnabled(enable);
		}
	}

}




/**
 * 
 */
package org.eclipse.tptp.monitoring.managedagent.ui.explorer.filter;

import org.eclipse.swt.widgets.Composite;
import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.ui.MAExplorerView;

/**
 * @author administrator
 *
 */
public class JMXAgentFilterProvider implements IFilterProvider {

	/* (non-Javadoc)
	 * @see org.eclipse.tptp.monitoring.managedagent.ui.explorer.filter.IFilterProvider#createFilterUI(org.eclipse.swt.widgets.Composite)
	 */
	public Composite createFilterUI(Composite parent) {
		// TODO Auto-generated method stub
		return null;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.tptp.monitoring.managedagent.ui.explorer.filter.IFilterProvider#enableFiltering(boolean)
	 */
	public void enableFiltering(boolean enable) {
		// TODO Auto-generated method stub

	}

	/* (non-Javadoc)
	 * @see org.eclipse.tptp.monitoring.managedagent.ui.explorer.filter.IFilterProvider#getFilter()
	 */
	public Object getFilter() {
		// TODO Auto-generated method stub
		return null;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.tptp.monitoring.managedagent.ui.explorer.filter.IFilterProvider#matchFilter(java.lang.Object)
	 */
	public boolean matchFilter(Object resource) {
		// TODO Auto-generated method stub
		return false;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.tptp.monitoring.managedagent.ui.explorer.filter.IFilterProvider#setFilter(java.lang.Object)
	 */
	public void setFilter(Object filter) {
		// TODO Auto-generated method stub

	}

	public void setMAXView(MAExplorerView view) {
		// TODO Auto-generated method stub
		
	}

}




/*******************************************************************************
 * Copyright (c) 2007 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 * 	Balan Subramanian (bsubram@us.ibm.com)
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.tptp.monitoring.managedagent.ui.explorer.filter;

import org.eclipse.swt.widgets.Composite;
import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.ui.MAExplorerView;


public interface IFilterProvider 
{
	/**
	 * This method is used to set the filter for the FilterProvider class. The parameter has to be cast to the correspoding filter class<br/>
	 * and used.
	 * @param filter - Filter Object.
	 */
	public void setFilter(Object filter);
	
	/**
	 * This methods returns an Object reperenting the filter that is being set. To be cast to the required class before use.
	 * @return Filter object
	 */
	public Object getFilter();
	
	/**
	 * Checks for the match criteria of the filter that is set using setFilter() method for the given resource object.<br/>
	 * 
	 * @param resource
	 * @return true if the resource matches the filter. false otherwise.
	 */
	public boolean matchFilter(Object resource);
	
	/**
	 * Called for creating the UI for this filter provider.
	 * @param parent - parent Composite
	 * @return A Composite containing the UI of this filter provider
	 */
	public Composite createFilterUI(Composite parent);
	
	/**
	 *enables or disables filtering based on the parameter 
	 * @param enable
	 */
	public void enableFiltering(boolean enable);
	
	/**
	 * Gives a handle for MAExplorerView so that it can be used to get its TreeViewer and ContentProvider.<br/>The user should not be calling this method. This method is called internally. 
	 * @param view
	 */
	public void setMAXView(MAExplorerView view);
}

Return to bug 165565

Lines 4-9 Link Here

(-)plugin.xml (+17 lines)
4	<extension-point id="selectionListener" name="Selection Listener" schema="schema/selectionListener.exsd"/>	4	<extension-point id="selectionListener" name="Selection Listener" schema="schema/selectionListener.exsd"/>
5	<extension-point id="actionProvider" name="Context menu action provider" schema="schema/actionProvider.exsd"/>	5	<extension-point id="actionProvider" name="Context menu action provider" schema="schema/actionProvider.exsd"/>
6	<extension-point id="connectionHelper" name="connectionHelper" schema="schema/connectionHelper.exsd"/>	6	<extension-point id="connectionHelper" name="connectionHelper" schema="schema/connectionHelper.exsd"/>
		7	<extension-point id="maxFilter" name="maxFilter" schema="schema/maxFilter.exsd"/>
7	<!-- sbalan	8	<!-- sbalan
8	<extension-point id="changeBroker" name="ChangeBroker" schema="schema/changeBroker.exsd"/>	9	<extension-point id="changeBroker" name="ChangeBroker" schema="schema/changeBroker.exsd"/>
9	-->	10	-->
Lines 99-104 Link Here
99	point="org.eclipse.ui.startup">	100	point="org.eclipse.ui.startup">
100	<startup class="org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.ManagedAgentUIPlugin"/>	101	<startup class="org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.ManagedAgentUIPlugin"/>
101	</extension>	102	</extension>
		103	<extension
		104	point="org.eclipse.tptp.monitoring.managedagent.ui.maxFilter"
		105	name="MAXFilter">
		106	<MAXFilter
		107	agentType="WSDM"
		108	providerClass="org.eclipse.tptp.monitoring.managedagent.ui.explorer.filter.WSDMAgentFilterProvider">
		109	</MAXFilter>
		110	</extension>
		111	<extension
		112	point="org.eclipse.tptp.monitoring.managedagent.ui.maxFilter"
		113	name="MAXFilter">
		114	<MAXFilter
		115	agentType="JMX"
		116	providerClass="org.eclipse.tptp.monitoring.managedagent.ui.explorer.filter.JMXAgentFilterProvider">
		117	</MAXFilter>
		118	</extension>
102	<!-- sbalan	119	<!-- sbalan
103	<extension	120	<extension
104	point="org.eclipse.tptp.monitoring.managedagent.ui.changeBroker">	121	point="org.eclipse.tptp.monitoring.managedagent.ui.changeBroker">

Added Link Here

(-)schema/maxFilter.exsd (+112 lines)
1	<?xml version='1.0' encoding='UTF-8'?>
2	<!-- Schema file written by PDE -->
3	<schema targetNamespace="org.eclipse.tptp.monitoring.managedagent.ui">
4	<annotation>
5	<appInfo>
6	<meta.schema plugin="org.eclipse.tptp.monitoring.managedagent.ui" id="maxFilter" name="maxFilter"/>
7	</appInfo>
8	<documentation>
9	[Enter description of this extension point.]
10	</documentation>
11	</annotation>
12
13	<element name="extension">
14	<complexType>
15	<sequence>
16	<element ref="MAXFilter"/>
17	</sequence>
18	<attribute name="point" type="string" use="required">
19	<annotation>
20	<documentation>
21
22	</documentation>
23	</annotation>
24	</attribute>
25	<attribute name="id" type="string">
26	<annotation>
27	<documentation>
28
29	</documentation>
30	</annotation>
31	</attribute>
32	<attribute name="name" type="string">
33	<annotation>
34	<documentation>
35
36	</documentation>
37	<appInfo>
38	<meta.attribute translatable="true"/>
39	</appInfo>
40	</annotation>
41	</attribute>
42	</complexType>
43	</element>
44
45	<element name="MAXFilter">
46	<complexType>
47	<attribute name="agentType" type="string" use="required">
48	<annotation>
49	<documentation>
50	This attribute specifies for which type of agent this filter is provided.
51	</documentation>
52	</annotation>
53	</attribute>
54	<attribute name="providerClass" type="string" use="required">
55	<annotation>
56	<documentation>
57	This class should implement IFilterProvider interface.
58	</documentation>
59	<appInfo>
60	<meta.attribute kind="java" basedOn="org.eclipse.tptp.monitoring.managedagent.ui.explorer.filter.IFilterProvider"/>
61	</appInfo>
62	</annotation>
63	</attribute>
64	</complexType>
65	</element>
66
67	<annotation>
68	<appInfo>
69	<meta.section type="since"/>
70	</appInfo>
71	<documentation>
72	[Enter the first release in which this extension point appears.]
73	</documentation>
74	</annotation>
75
76	<annotation>
77	<appInfo>
78	<meta.section type="examples"/>
79	</appInfo>
80	<documentation>
81	[Enter extension point usage example here.]
82	</documentation>
83	</annotation>
84
85	<annotation>
86	<appInfo>
87	<meta.section type="apiInfo"/>
88	</appInfo>
89	<documentation>
90	[Enter API information here.]
91	</documentation>
92	</annotation>
93
94	<annotation>
95	<appInfo>
96	<meta.section type="implementation"/>
97	</appInfo>
98	<documentation>
99	[Enter information about supplied implementation of this extension point.]
100	</documentation>
101	</annotation>
102
103	<annotation>
104	<appInfo>
105	<meta.section type="copyright"/>
106	</appInfo>
107	<documentation>
108
109	</documentation>
110	</annotation>
111
112	</schema>

Added Link Here

(-)src/org/eclipse/tptp/monitoring/managedagent/ui/explorer/filter/IFilterProvider.java (+59 lines)
1	/*******************************************************************************
2	* Copyright (c) 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	* Contributors:
9	* Balan Subramanian (bsubram@us.ibm.com)
10	* IBM Corporation - initial API and implementation
11	*******************************************************************************/
12	package org.eclipse.tptp.monitoring.managedagent.ui.explorer.filter;
13
14	import org.eclipse.swt.widgets.Composite;
15	import org.eclipse.tptp.monitoring.managedagent.ui.explorer.internal.ui.MAExplorerView;
16
17
18	public interface IFilterProvider
19	{
20	/**
21	* This method is used to set the filter for the FilterProvider class. The parameter has to be cast to the correspoding filter class<br/>
22	* and used.
23	* @param filter - Filter Object.
24	*/
25	public void setFilter(Object filter);
26
27	/**
28	* This methods returns an Object reperenting the filter that is being set. To be cast to the required class before use.
29	* @return Filter object
30	*/
31	public Object getFilter();
32
33	/**
34	* Checks for the match criteria of the filter that is set using setFilter() method for the given resource object.<br/>
35	*
36	* @param resource
37	* @return true if the resource matches the filter. false otherwise.
38	*/
39	public boolean matchFilter(Object resource);
40
41	/**
42	* Called for creating the UI for this filter provider.
43	* @param parent - parent Composite
44	* @return A Composite containing the UI of this filter provider
45	*/
46	public Composite createFilterUI(Composite parent);
47
48	/**
49	*enables or disables filtering based on the parameter
50	* @param enable
51	*/
52	public void enableFiltering(boolean enable);
53
54	/**
55	* Gives a handle for MAExplorerView so that it can be used to get its TreeViewer and ContentProvider.<br/>The user should not be calling this method. This method is called internally.
56	* @param view
57	*/
58	public void setMAXView(MAExplorerView view);
59	}