Attachment 182837 Details for Bug 109045 – Patch to add the new Filter using Command Handler Framework

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

[patch] Patch to add the new Filter using Command Handler Framework

109045_FilterHandler.patch (text/plain), 102.01 KB, created by Sarika Sinha

on 2010-11-10 12:37:34 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Sarika Sinha

Created: 2010-11-10 12:37:34 EST

Size: 102.01 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.jsp.ui
>Index: plugin.properties
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.jst.jsp.ui/plugin.properties,v
>retrieving revision 1.29
>diff -u -r1.29 plugin.properties
>--- plugin.properties	14 Jul 2010 17:14:10 -0000	1.29
>+++ plugin.properties	10 Nov 2010 17:14:36 -0000
>@@ -112,3 +112,11 @@
> proposalCategory.jspTemplates=JSP Template Proposals
> proposalCategory.jsp=JSP Proposals
> proposalCategory.jspJava=JSP Java Proposals
>+
>+##
>+HideImportDeclaration.label=Import Directive
>+HideImportDeclaration.description=Hides Import Directives
>+HideFontStyle.label=Font Style
>+HideFontStyle.description=Hides Font Style Tags
>+HideComments.label=Comments
>+HideComments.description=Hides Comments
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.jst.jsp.ui/plugin.xml,v
>retrieving revision 1.101
>diff -u -r1.101 plugin.xml
>--- plugin.xml	8 Oct 2010 13:44:01 -0000	1.101
>+++ plugin.xml	10 Nov 2010 17:14:41 -0000
>@@ -1329,4 +1329,31 @@
> contentTypeID="org.eclipse.jst.jsp.core.jspsource">
> </categoriesConfiguration>
> </extension>
>+<extension
>+	 point="org.eclipse.wst.sse.ui.outlineElementFilter">
>+	 <filter
>+	 targetId="org.eclipse.jst.jsp.ui.OutlinePage"
>+	 name="%HideImportDeclaration.label"
>+	 enabled="false"
>+	 description="%HideImportDeclaration.description"
>+	 class="org.eclipse.jst.jsp.ui.views.contentoutline.JSPImportDirectiveFilter"
>+	 id="org.eclipse.jst.jsp.ui.views.contentoutline.JSPImportDirectiveFilter">
>+	 </filter>
>+	 <filter
>+	 targetId="org.eclipse.jst.jsp.ui.OutlinePage"
>+	 name="%HideFontStyle.label"
>+	 enabled="false"
>+	 description="%HideFontStyle.description"
>+	 class="org.eclipse.wst.html.ui.views.contentoutline.HTMLFontStyleFilter"
>+	 id="org.eclipse.jst.jsp.ui.views.contentoutline.HTMLFontStyleFilter">
>+	 </filter>
>+	 <filter
>+ targetId="org.eclipse.jst.jsp.ui.OutlinePage"
>+ name="%HideComments.label"
>+ enabled="false"
>+ description="%HideComments.description"
>+ class="org.eclipse.wst.xml.ui.views.contentoutline.XMLCommentFilter"
>+ id="org.eclipse.jst.jsp.ui.views.contentoutline.XMLCommentFilter">
>+ </filter>
>+</extension>
> </plugin>
>Index: src/org/eclipse/jst/jsp/ui/internal/views/contentoutline/TLDContentOutlineConfiguration.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/views/contentoutline/TLDContentOutlineConfiguration.java,v
>retrieving revision 1.4
>diff -u -r1.4 TLDContentOutlineConfiguration.java
>--- src/org/eclipse/jst/jsp/ui/internal/views/contentoutline/TLDContentOutlineConfiguration.java	28 Jan 2009 22:58:55 -0000	1.4
>+++ src/org/eclipse/jst/jsp/ui/internal/views/contentoutline/TLDContentOutlineConfiguration.java	10 Nov 2010 17:14:42 -0000
>@@ -278,8 +278,8 @@
> 			update();
> 		}
> 
>-		/*
>-		 * (non-Javadoc)
>+		
>+		/* (non-Javadoc)
> 		 * 
> 		 * @see org.eclipse.ui.texteditor.IUpdate#update()
> 		 */
>@@ -343,7 +343,7 @@
> 	 * org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration
> 	 * #getPreferenceStore()
> 	 */
>-	protected IPreferenceStore getPreferenceStore() {
>+	public IPreferenceStore getPreferenceStore() {
> 		return JSPUIPlugin.getDefault().getPreferenceStore();
> 	}
> }
>Index: src/org/eclipse/jst/jsp/ui/views/contentoutline/JSPContentOutlineConfiguration.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/views/contentoutline/JSPContentOutlineConfiguration.java,v
>retrieving revision 1.6
>diff -u -r1.6 JSPContentOutlineConfiguration.java
>--- src/org/eclipse/jst/jsp/ui/views/contentoutline/JSPContentOutlineConfiguration.java	6 Apr 2010 17:48:11 -0000	1.6
>+++ src/org/eclipse/jst/jsp/ui/views/contentoutline/JSPContentOutlineConfiguration.java	10 Nov 2010 17:14:42 -0000
>@@ -35,7 +35,7 @@
> 	// be used
> 	// private StructuredContentOutlineConfiguration fEmbeddedConfiguration =
> 	// null;
>-
>+	private final String OUTLINE_FILTER_PREF = "org.eclipse.jst.jsp.ui.OutlinePage"; //$NON-NLS-1$
> 	/**
> 	 * Create new instance of JSPContentOutlineConfiguration
> 	 */
>@@ -49,11 +49,15 @@
> 	 * 
> 	 * @see org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration#getPreferenceStore()
> 	 */
>-	protected IPreferenceStore getPreferenceStore() {
>+	public IPreferenceStore getPreferenceStore() {
> 		return JSPUIPlugin.getDefault().getPreferenceStore();
> 	}
> 	
> 	protected XMLNodeActionManager createNodeActionManager(TreeViewer treeViewer) {
> 		return new JSPNodeActionManager((IStructuredModel) treeViewer.getInput(), treeViewer);
> 	}
>+	
>+	public String getOutlineFilterTarget(){
>+		return OUTLINE_FILTER_PREF ;
>+	}
> }
>Index: src/org/eclipse/jst/jsp/ui/views/contentoutline/JSPImportDirectiveFilter.java
>===================================================================
>RCS file: src/org/eclipse/jst/jsp/ui/views/contentoutline/JSPImportDirectiveFilter.java
>diff -N src/org/eclipse/jst/jsp/ui/views/contentoutline/JSPImportDirectiveFilter.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/jst/jsp/ui/views/contentoutline/JSPImportDirectiveFilter.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,44 @@
>+/*******************************************************************************
>+ * Copyright (c) 2010 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:
>+ * IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.jst.jsp.ui.views.contentoutline;
>+
>+import org.eclipse.jdt.internal.ui.filters.ImportDeclarationFilter;
>+import org.eclipse.jface.viewers.Viewer;
>+import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.JSP20TLDNames;
>+import org.eclipse.jst.jsp.core.internal.provisional.JSP11Namespace;
>+import org.w3c.dom.NamedNodeMap;
>+import org.w3c.dom.Node;
>+
>+public class JSPImportDirectiveFilter extends ImportDeclarationFilter {
>+
>+
>+	/*
>+	 * @see ViewerFilter
>+	 */
>+	public boolean select(Viewer viewer, Object parent, Object element) {
>+		if (super.select(viewer, parent, element)){
>+			if (element instanceof Node){
>+				Node node = (Node)element;
>+				if (node.getNodeName().equalsIgnoreCase(JSP11Namespace.ElementName.DIRECTIVE_PAGE)){
>+						NamedNodeMap nodeMap = node.getAttributes();
>+						for (int i=0;i <nodeMap.getLength();i++){
>+							Node attr = nodeMap.item(i);
>+							if (attr.toString().equalsIgnoreCase(JSP20TLDNames.IMPORT))
>+								return false;
>+						}
>+				}
>+			}
>+			return true;
>+		}
>+		else
>+			return false;
>+	}
>+}
>#P org.eclipse.wst.css.ui
>Index: plugin.properties
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.css.ui/plugin.properties,v
>retrieving revision 1.27
>diff -u -r1.27 plugin.properties
>--- plugin.properties	29 Apr 2010 00:37:19 -0000	1.27
>+++ plugin.properties	10 Nov 2010 17:15:07 -0000
>@@ -82,3 +82,6 @@
> 
> proposalCategory.css=CSS Proposals
> proposalCategory.cssTemplates=CSS Template Proposals
>+
>+HideComments.label=Comments
>+HideComments.description=Hides Comments
>\ No newline at end of file
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.css.ui/plugin.xml,v
>retrieving revision 1.54
>diff -u -r1.54 plugin.xml
>--- plugin.xml	19 Apr 2010 17:16:18 -0000	1.54
>+++ plugin.xml	10 Nov 2010 17:15:10 -0000
>@@ -738,4 +738,15 @@
> contentTypeID="org.eclipse.wst.css.core.csssource">
> </categoriesConfiguration>
> </extension>
>+ <extension
>+ point="org.eclipse.wst.sse.ui.outlineElementFilter">
>+ <filter
>+ targetId="org.eclipse.wst.css.ui.OutlinePage"
>+ name="%HideComments.label"
>+ enabled="false"
>+ description="%HideComments.description"
>+ class="org.eclipse.wst.xml.ui.views.contentoutline.XMLCommentFilter"
>+ id="org.eclipse.wst.css.ui.views.contentoutline.XMLCommentFilter">
>+ </filter>
>+</extension>
> </plugin>
>Index: src/org/eclipse/wst/css/ui/views/contentoutline/CSSContentOutlineConfiguration.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/CSSContentOutlineConfiguration.java,v
>retrieving revision 1.14
>diff -u -r1.14 CSSContentOutlineConfiguration.java
>--- src/org/eclipse/wst/css/ui/views/contentoutline/CSSContentOutlineConfiguration.java	5 Dec 2005 19:34:59 -0000	1.14
>+++ src/org/eclipse/wst/css/ui/views/contentoutline/CSSContentOutlineConfiguration.java	10 Nov 2010 17:15:11 -0000
>@@ -33,6 +33,8 @@
> 	private IContentProvider fContentProvider = null;
> 	private ILabelProvider fLabelProvider = null;
> 	private final String OUTLINE_SORT_PREF = "outline-sort"; //$NON-NLS-1$
>+	private final String OUTLINE_FILTER_PREF = "org.eclipse.wst.css.ui.OutlinePage"; //$NON-NLS-1$
>+	
> 
> 	/**
> 	 * Create new instance of CSSContentOutlineConfiguration
>@@ -106,7 +108,7 @@
> 	 * 
> 	 * @see org.eclipse.wst.sse.ui.views.contentoutline.StructuredContentOutlineConfiguration#getPreferenceStore()
> 	 */
>-	protected IPreferenceStore getPreferenceStore() {
>+	public IPreferenceStore getPreferenceStore() {
> 		return CSSUIPlugin.getDefault().getPreferenceStore();
> 	}
> 
>@@ -118,4 +120,8 @@
> 		}
> 		return filteredSelection;
> 	}
>+	
>+	public String getOutlineFilterTarget(){
>+		return OUTLINE_FILTER_PREF ;
>+	}
> }
>\ No newline at end of file
>#P org.eclipse.wst.dtd.ui
>Index: src/org/eclipse/wst/dtd/ui/views/contentoutline/DTDContentOutlineConfiguration.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/DTDContentOutlineConfiguration.java,v
>retrieving revision 1.21
>diff -u -r1.21 DTDContentOutlineConfiguration.java
>--- src/org/eclipse/wst/dtd/ui/views/contentoutline/DTDContentOutlineConfiguration.java	31 Jan 2007 05:39:42 -0000	1.21
>+++ src/org/eclipse/wst/dtd/ui/views/contentoutline/DTDContentOutlineConfiguration.java	10 Nov 2010 17:15:37 -0000
>@@ -59,7 +59,8 @@
> 	private Map fViewerContributions;
> 	private final String OUTLINE_ORDER_PREF = "outline-order"; //$NON-NLS-1$
> 	private final String OUTLINE_SORT_PREF = "outline-sort"; //$NON-NLS-1$
>-
>+	private final String OUTLINE_FILTER_PREF = "org.eclipse.wst.dtd.ui.OutlinePage"; //$NON-NLS-1$
>+	
> 	/**
> 	 * Default constructor for DTDContentOutlineConfiguration.
> 	 */
>@@ -146,7 +147,7 @@
> 	 * 
> 	 * @see org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration#getPreferenceStore()
> 	 */
>-	protected IPreferenceStore getPreferenceStore() {
>+	public IPreferenceStore getPreferenceStore() {
> 		return DTDUIPlugin.getDefault().getPreferenceStore();
> 	}
> 
>@@ -279,4 +280,8 @@
> 			fMenuHelper = null;
> 		}
> 	}
>+	
>+	public String getOutlineFilterTarget(){
>+		return OUTLINE_FILTER_PREF ;
>+	}
> }
>#P org.eclipse.wst.html.ui
>Index: plugin.properties
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.html.ui/plugin.properties,v
>retrieving revision 1.32
>diff -u -r1.32 plugin.properties
>--- plugin.properties	29 Apr 2010 00:47:28 -0000	1.32
>+++ plugin.properties	10 Nov 2010 17:16:00 -0000
>@@ -80,3 +80,8 @@
> 
> proposalCategory.htmlTags=HTML Tag Proposals
> proposalCategory.htmlTemplates=HTML Template Proposals
>+
>+HideFontStyle.label=Font Style
>+HideFontStyle.description=Hides Font Style TagsproposalCategory.htmlTags=HTML Tag Proposals
>+HideComments.label=Comments
>+HideComments.description=Hides Comments
>\ No newline at end of file
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.html.ui/plugin.xml,v
>retrieving revision 1.94
>diff -u -r1.94 plugin.xml
>--- plugin.xml	15 Apr 2010 03:10:08 -0000	1.94
>+++ plugin.xml	10 Nov 2010 17:16:03 -0000
>@@ -700,5 +700,25 @@
> contentTypeID="org.eclipse.wst.html.core.htmlsource">
> </categoriesConfiguration>
> </extension>
>+ 
>+<extension
>+ point="org.eclipse.wst.sse.ui.outlineElementFilter">
>+ <filter
>+ targetId="org.eclipse.wst.html.ui.OutlinePage"
>+ name="%HideFontStyle.label"
>+ enabled="false"
>+ description="%HideFontStyle.description"
>+ class="org.eclipse.wst.html.ui.views.contentoutline.HTMLFontStyleFilter"
>+ id="org.eclipse.wst.html.ui.views.contentoutline.HTMLFontStyleFilter">
>+ </filter>
>+ <filter
>+ targetId="org.eclipse.wst.html.ui.OutlinePage"
>+ name="%HideComments.label"
>+ enabled="false"
>+ description="%HideComments.description"
>+ class="org.eclipse.wst.xml.ui.views.contentoutline.XMLCommentFilter"
>+ id="org.eclipse.wst.html.ui.views.contentoutline.XMLCommentFilter">
>+ </filter>
>+</extension>
> 	
> </plugin>
>Index: src/org/eclipse/wst/html/ui/views/contentoutline/HTMLContentOutlineConfiguration.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/views/contentoutline/HTMLContentOutlineConfiguration.java,v
>retrieving revision 1.8
>diff -u -r1.8 HTMLContentOutlineConfiguration.java
>--- src/org/eclipse/wst/html/ui/views/contentoutline/HTMLContentOutlineConfiguration.java	5 Dec 2005 19:32:39 -0000	1.8
>+++ src/org/eclipse/wst/html/ui/views/contentoutline/HTMLContentOutlineConfiguration.java	10 Nov 2010 17:16:04 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2004, 2005 IBM Corporation and others.
>+ * Copyright (c) 2004, 2010 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
>@@ -25,7 +25,7 @@
> * @since 1.0
> */
> public class HTMLContentOutlineConfiguration extends XMLContentOutlineConfiguration {
>-
>+	private final String OUTLINE_FILTER_PREF = "org.eclipse.wst.html.ui.OutlinePage"; //$NON-NLS-1$
> 	/**
> 	 * Create new instance of HTMLContentOutlineConfiguration
> 	 */
>@@ -38,7 +38,11 @@
> 		return new HTMLNodeActionManager((IStructuredModel) treeViewer.getInput(), treeViewer);
> 	}
> 
>-	protected IPreferenceStore getPreferenceStore() {
>+	public IPreferenceStore getPreferenceStore() {
> 		return HTMLUIPlugin.getDefault().getPreferenceStore();
> 	}
>+	
>+	public String getOutlineFilterTarget(){
>+		return OUTLINE_FILTER_PREF ;
>+	}
> }
>\ No newline at end of file
>Index: src/org/eclipse/wst/html/ui/views/contentoutline/HTMLFontStyleFilter.java
>===================================================================
>RCS file: src/org/eclipse/wst/html/ui/views/contentoutline/HTMLFontStyleFilter.java
>diff -N src/org/eclipse/wst/html/ui/views/contentoutline/HTMLFontStyleFilter.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/wst/html/ui/views/contentoutline/HTMLFontStyleFilter.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,46 @@
>+/*******************************************************************************
>+ * Copyright (c) 2010 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:
>+ * IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.wst.html.ui.views.contentoutline;
>+
>+import java.util.ArrayList;
>+
>+import org.eclipse.jface.viewers.Viewer;
>+import org.eclipse.jface.viewers.ViewerFilter;
>+import org.eclipse.wst.html.core.internal.document.ElementStyleImpl;
>+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
>+
>+public class HTMLFontStyleFilter extends ViewerFilter {
>+	final static ArrayList fontStyles = new ArrayList(9);
>+	static {
>+		
>+		fontStyles.add(HTML40Namespace.ElementName.TT.toLowerCase());
>+		fontStyles.add(HTML40Namespace.ElementName.I.toLowerCase());
>+		fontStyles.add(HTML40Namespace.ElementName.B.toLowerCase());
>+		fontStyles.add(HTML40Namespace.ElementName.P.toLowerCase());
>+		fontStyles.add(HTML40Namespace.ElementName.S.toLowerCase());
>+		fontStyles.add(HTML40Namespace.ElementName.STRIKE.toLowerCase());
>+		fontStyles.add(HTML40Namespace.ElementName.BIG.toLowerCase());
>+		fontStyles.add(HTML40Namespace.ElementName.SMALL.toLowerCase());
>+		fontStyles.add(HTML40Namespace.ElementName.U.toLowerCase());
>+	}
>+
>+	public boolean select(Viewer viewer, Object parentElement, Object element) {
>+		if (element instanceof ElementStyleImpl){
>+			ElementStyleImpl elemImpl = (ElementStyleImpl)element;
>+			String nodeName = elemImpl.getNodeName().toLowerCase();
>+			if (fontStyles.contains(nodeName)){
>+				return false;
>+			}
>+		}
>+		return true;
>+	}
>+
>+}
>#P org.eclipse.wst.sse.ui
>Index: icons/full/elcl16/filter_ps.gif
>===================================================================
>RCS file: icons/full/elcl16/filter_ps.gif
>diff -N icons/full/elcl16/filter_ps.gif
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ icons/full/elcl16/filter_ps.gif	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,1 @@
>+GIF89aÄ8D]ovWd|we}\¥N?½T³MZ]þýïýòÆýñÆýñÇýòÇüæ½µz®u´{ºº?¹©o¯t¯u®t¯t¯u®t¦kÿÿÿ!ù,X 'diã`"ª¥qD`»ð*¶¢ ?(ÀóxüJ?Ñ4iN*ÏDR(?Å¢¡`h%%M&¹p0Çæ(²8,« gØéèx_lV»yrw.lr"!;
>\ No newline at end of file
>Index: plugin.properties
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.sse.ui/plugin.properties,v
>retrieving revision 1.32
>diff -u -r1.32 plugin.properties
>--- plugin.properties	29 Apr 2010 00:49:15 -0000	1.32
>+++ plugin.properties	10 Nov 2010 17:16:29 -0000
>@@ -109,3 +109,8 @@
> Colors.content_assist_proposals_foreground=Content Assist Proposals Foreground
> Colors.content_assist_parameters_background=Content Assist Parameters Background
> Colors.content_assist_parameters_foreground=Content Assist Parameters Foreground
>+
>+#outline filter
>+elementFiltersName=SSE Element Filters
>+
>+command.outline.customFilter=Filters
>\ No newline at end of file
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.sse.ui/plugin.xml,v
>retrieving revision 1.71
>diff -u -r1.71 plugin.xml
>--- plugin.xml	23 Jul 2010 20:36:36 -0000	1.71
>+++ plugin.xml	10 Nov 2010 17:16:32 -0000
>@@ -23,8 +23,12 @@
> 		id="characterPairing"
> 		name="%Character_Pairing.name"
> 		schema="schema/characterPairing.exsd" ></extension-point>
>-
>-
>+	<extension-point
>+	 id="outlineElementFilter" 
>+	 name="%elementFiltersName" 
>+	 schema="schema/outlineElementFilter.exsd">
>+	</extension-point>
>+ 
> 	
> 	<extension point="org.eclipse.core.runtime.preferences">
> 		<initializer
>@@ -679,10 +683,24 @@
> 				</command>
> 				
> 	 </menuContribution>
>+	 
>+	 <menuContribution locationURI="menu:org.eclipse.ui.views.ContentOutline?after=additions">
>+			<command 
>+				commandId="org.eclipse.wst.sse.ui.outline.customFilter" 
>+				id="org.eclipse.wst.sse.ui.outline.customFilter"
>+				label="%command.outline.customFilter" 
>+				icon ="icons/full/elcl16/filter_ps.gif"
>+				style="push">
>+			</command>
>+		</menuContribution>
> 	</extension>
> 	<extension
> point="org.eclipse.ui.commands">
> 	 <command
>+	 id="org.eclipse.wst.sse.ui.outline.customFilter"
>+	 name="%command.outline.customFilter">
>+	 </command>
>+	 <command
> 	 id="org.eclipse.wst.sse.ui.format"
> 	 name="%command.format.document.name">
> 	 </command>
>@@ -708,6 +726,12 @@
> 				</iterate>
> 			</enabledWhen>
> 		</handler>
>+		
>+		<handler
>+			class="org.eclipse.wst.sse.ui.internal.handlers.CustomFilterHandler"
>+			commandId="org.eclipse.wst.sse.ui.outline.customFilter">
>+		</handler>
>+		
> 	</extension>
> 	
> 	<extension point="org.eclipse.core.expressions.definitions">
>Index: schema/outlineElementFilter.exsd
>===================================================================
>RCS file: schema/outlineElementFilter.exsd
>diff -N schema/outlineElementFilter.exsd
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ schema/outlineElementFilter.exsd	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,136 @@
>+<?xml version='1.0' encoding='UTF-8'?>
>+
>+<schema targetNamespace="org.eclipse.wst.sse.ui" xmlns="http://www.w3.org/2001/XMLSchema">
>+<annotation>
>+ <appInfo>
>+ <meta.schema plugin="org.eclipse.wst.sse.ui" id="outlineElementFilter" name="%elementFiltersName"/>
>+ </appInfo>
>+ <documentation>
>+ [Enter description of this extension point.]
>+ </documentation>
>+ </annotation>
>+
>+ <element name="extension">
>+ <annotation>
>+ <appInfo>
>+ <meta.element />
>+ </appInfo>
>+ </annotation>
>+ <complexType>
>+ <sequence>
>+ <element ref="filter" minOccurs="1" maxOccurs="unbounded"/>
>+ </sequence>
>+ <attribute name="point" type="string" use="required">
>+ <annotation>
>+ <documentation>
>+ a fully qualified identifier of the target extension point
>+ </documentation>
>+ </annotation>
>+ </attribute>
>+ <attribute name="id" type="string">
>+ <annotation>
>+ <documentation>
>+ an optional identifier of the extension instance
>+ </documentation>
>+ </annotation>
>+ </attribute>
>+ <attribute name="name" type="string">
>+ <annotation>
>+ <documentation>
>+ an optional name of the extension instance
>+ </documentation>
>+ <appInfo>
>+ <meta.attribute translatable="true"/>
>+ </appInfo>
>+ </annotation>
>+ </attribute>
>+ </complexType>
>+ </element>
>+
>+ <element name="filter">
>+ <annotation>
>+ <appInfo>
>+ <meta.element labelAttribute="name"/>
>+ </appInfo>
>+ </annotation>
>+ <complexType>
>+ <attribute name="id" type="string">
>+ <annotation>
>+ <documentation>
>+ a unique id that will be used to identify this filter
>+ </documentation>
>+ </annotation>
>+ </attribute>
>+ <attribute name="name" type="string">
>+ <annotation>
>+ <documentation>
>+ a unique name that allows to identify this filter in the UI. This attribute should be a translated string. Though this attribute is not required for pattern filters (i.e. those using the &lt;samp&gt;pattern&lt;/samp&gt; attribute) we suggest to provide a name anyway, otherwise the pattern string itself would be used to represent the filter in the UI.
>+ </documentation>
>+ <appInfo>
>+ <meta.attribute translatable="true"/>
>+ </appInfo>
>+ </annotation>
>+ </attribute>
>+ <attribute name="description" type="string">
>+ <annotation>
>+ <documentation>
>+ a short description for this filter
>+ </documentation>
>+ <appInfo>
>+ <meta.attribute translatable="true"/>
>+ </appInfo>
>+ </annotation>
>+ </attribute>
>+ <attribute name="targetId" type="string">
>+ <annotation>
>+ <documentation>
>+ the id of the target where this filter is contributed. If this attribute is missing, then the filter will
>+be contributed to all views which use the &lt;code&gt;org.eclipse.wst.sse.ui.actions.CustomFiltersAction&lt;/code&gt;.
>+ </documentation>
>+ </annotation>
>+ </attribute>
>+ <attribute name="enabled" type="boolean">
>+ <annotation>
>+ <documentation>
>+ the filter will be enabled if this attribute is &quot;true&quot; or if this attribute is not present. Most likely the user will be able to override this setting in the UI.
>+ </documentation>
>+ </annotation>
>+ </attribute>
>+ <attribute name="class" type="string">
>+ <annotation>
>+ <documentation>
>+ the name of the class used to filter the view. The class must extend &lt;code&gt;org.eclipse.jface.viewers.ViewerFilter&lt;/code&gt;. If this attribute is here
>+then the pattern attribute must not provided.
>+ </documentation>
>+ <appInfo>
>+ <meta.attribute kind="java" basedOn="org.eclipse.jface.viewers.ViewerFilter"/>
>+ </appInfo>
>+ </annotation>
>+ </attribute>
>+ </complexType>
>+ </element>
>+
>+ <annotation>
>+ <appInfo>
>+ <meta.section type="examples"/>
>+ </appInfo>
>+ <documentation>
>+ Works similar to javaElementFilter definition with targetId as &quot;org.wst.sse.ui.OutlinePage&quot;.
>+ Target id can be changed for different content types to provide their own filters
>+ </documentation>
>+ </annotation>
>+
>+
>+
>+
>+ <annotation>
>+ <appInfo>
>+ <meta.section type="copyright"/>
>+ </appInfo>
>+ <documentation>
>+ Copyright (c) 2010 IBM Corporation and others.&lt;br&gt;
>+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 &lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
>+ </documentation>
>+ </annotation>
>+
>+</schema>
>Index: src/org/eclipse/wst/sse/ui/internal/contentoutline/ConfigurableContentOutlinePage.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/contentoutline/ConfigurableContentOutlinePage.java,v
>retrieving revision 1.19
>diff -u -r1.19 ConfigurableContentOutlinePage.java
>--- src/org/eclipse/wst/sse/ui/internal/contentoutline/ConfigurableContentOutlinePage.java	30 Oct 2009 14:05:01 -0000	1.19
>+++ src/org/eclipse/wst/sse/ui/internal/contentoutline/ConfigurableContentOutlinePage.java	10 Nov 2010 17:16:59 -0000
>@@ -395,6 +395,7 @@
> 		}
> 		getTreeViewer().addDoubleClickListener(fDoubleClickProvider);
> 		getSite().setSelectionProvider(fSelectionProvider);
>+		
> 	}
> 
> 	public void dispose() {
>@@ -754,4 +755,8 @@
> 			mgr.setMessage(image, text);
> 		}
> 	}
>+	
>+	 public TreeViewer getTreeViewer() {
>+ return super.getTreeViewer();
>+ }
> }
>Index: src/org/eclipse/wst/sse/ui/internal/filter/CustomFilterProcessor.java
>===================================================================
>RCS file: src/org/eclipse/wst/sse/ui/internal/filter/CustomFilterProcessor.java
>diff -N src/org/eclipse/wst/sse/ui/internal/filter/CustomFilterProcessor.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/wst/sse/ui/internal/filter/CustomFilterProcessor.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,325 @@
>+/*******************************************************************************
>+	 * Copyright (c) 2010 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:
>+	 * IBM Corporation - initial API and implementation
>+	 *******************************************************************************/
>+package org.eclipse.wst.sse.ui.internal.filter;
>+import java.util.ArrayList;
>+import java.util.HashMap;
>+import java.util.HashSet;
>+import java.util.Iterator;
>+import java.util.Map;
>+
>+import org.eclipse.core.runtime.Assert;
>+import org.eclipse.jface.preference.IPreferenceStore;
>+import org.eclipse.jface.viewers.StructuredViewer;
>+import org.eclipse.jface.viewers.ViewerFilter;
>+import org.eclipse.jface.window.Window;
>+
>+	/**
>+	 * Action group to add the filter action to a view part's tool bar
>+	 * menu.
>+	 * 
>+	 * This class may be instantiated; it is not intended to be subclassed.
>+	 * 
>+	 *
>+	 * @noextend This class is not intended to be subclassed by clients.
>+	 */
>+	public class CustomFilterProcessor {
>+
>+		
>+		private static final String SEPARATOR= ","; //$NON-NLS-1$
>+		private final String TAG_USER_DEFINED_PATTERNS_ENABLED= "userDefinedPatternsEnabled"; //$NON-NLS-1$
>+		private final String TAG_USER_DEFINED_PATTERNS= "userDefinedPatterns"; //$NON-NLS-1$
>+		
>+		
>+		private static class FilterItem {
>+			boolean enabled;
>+			boolean previouslyEnabled;
>+			OutlineFilterDescriptor descriptor;
>+			String id;
>+
>+			private ViewerFilter filterInstance= null;
>+
>+			public FilterItem(OutlineFilterDescriptor descriptor) {
>+				this.descriptor= descriptor;
>+				this.id= descriptor.getId();
>+				this.previouslyEnabled= false;
>+				this.enabled= descriptor.isEnabled();
>+			}
>+
>+			public ViewerFilter getFilterInstance() {
>+				if (filterInstance == null) {
>+					filterInstance= descriptor.createViewerFilter();
>+				}
>+				return filterInstance;
>+
>+			}
>+		}
>+
>+
>+		private final StructuredViewer fViewer;
>+		private final OutlineNamePatternFilter fPatternFilter;
>+
>+		private boolean fUserDefinedPatternsEnabled;
>+		private String[] fUserDefinedPatterns;
>+
>+		private String[] fPreviousPatterns;
>+
>+		private final Map fFilterItems;
>+
>+
>+		
>+		private final String fTargetId;
>+		private IPreferenceStore fStore;
>+		
>+
>+		/**
>+		 * Creates a new <code>CustomFilterAction</code>.
>+		 *
>+		 * @param store the preference Store 
>+		 * @param ownerId	the id of this action group's owner
>+		 * @param viewer	the viewer to be filtered
>+		 */
>+		public CustomFilterProcessor(IPreferenceStore store,String ownerId, StructuredViewer viewer) {
>+			Assert.isNotNull(ownerId);
>+			Assert.isNotNull(viewer);
>+			fStore = store;
>+			fTargetId= ownerId;
>+			fViewer= viewer;
>+			fPatternFilter= new OutlineNamePatternFilter();
>+
>+			fUserDefinedPatterns= new String[0];
>+			fUserDefinedPatternsEnabled= false;
>+			fPreviousPatterns= new String[0];
>+
>+			fFilterItems= new HashMap();
>+			OutlineFilterDescriptor[] filterDescriptors= OutlineFilterDescriptor.getFilterDescriptors(fTargetId);
>+			for (int i= 0; i < filterDescriptors.length; i++) {
>+				FilterItem item= new FilterItem(filterDescriptors[i]);
>+				fFilterItems.put(item.id, item);
>+				
>+			}
>+
>+			initializeWithViewDefaults();
>+
>+			updateViewerFilters();
>+					
>+		}
>+		
>+		
>+		
>+
>+		/*
>+		 * @see org.eclipse.jface.action.IContributionItem#isDynamic()
>+		 */
>+		public boolean isDynamic() {
>+			return true;
>+		}
>+		/**
>+		 * Returns a list of currently enabled filters. The filter
>+		 * is identified by its id.
>+		 * 
>+		 * This method is for internal use only and should not
>+		 * be called by clients outside of JDT/UI.
>+		 * 
>+		 *
>+		 * @return a list of currently enabled filters
>+		 *
>+		 * @noreference This method is not intended to be referenced by clients.
>+		 */
>+		public String[] internalGetEnabledFilterIds() {
>+			ArrayList enabledFilterIds= new ArrayList();
>+			for (Iterator iterator= fFilterItems.values().iterator(); iterator.hasNext();) {
>+				FilterItem item= (FilterItem) iterator.next();
>+				if (item.enabled) {
>+					enabledFilterIds.add(item.id);
>+				}
>+			}
>+			return (String[])enabledFilterIds.toArray(new String[enabledFilterIds.size()]);
>+		}
>+
>+		private void setEnabledFilterIds(String[] enabledIds) {
>+			// set all to false
>+			fUserDefinedPatternsEnabled= false;
>+			for (Iterator iterator= fFilterItems.values().iterator(); iterator.hasNext();) {
>+				FilterItem item= (FilterItem) iterator.next();
>+				item.enabled= false;
>+			}
>+			// set enabled to true
>+			for (int i= 0; i < enabledIds.length; i++) {
>+				FilterItem item= (FilterItem) fFilterItems.get(enabledIds[i]);
>+				if (item != null) {
>+					item.enabled= true;
>+				}
>+				if (fPatternFilter.getClass().getName().equals(enabledIds[i]))
>+					fUserDefinedPatternsEnabled= true;
>+			}
>+		}
>+
>+		private void setUserDefinedPatterns(String[] patterns) {
>+			fUserDefinedPatterns= patterns;
>+		}
>+
>+
>+		private boolean areUserDefinedPatternsEnabled() {
>+			return fUserDefinedPatternsEnabled;
>+		}
>+
>+		private void setUserDefinedPatternsEnabled(boolean state) {
>+			fUserDefinedPatternsEnabled= state;
>+		}
>+
>+				
>+		// ---------- viewer filter handling ----------
>+
>+		private boolean updateViewerFilters() {
>+			ViewerFilter[] installedFilters= fViewer.getFilters();
>+			ArrayList viewerFilters= new ArrayList(installedFilters.length);
>+			
>+			HashSet patterns= new HashSet();
>+
>+			boolean hasChange= false;
>+			boolean patternChange= false;
>+
>+			for (Iterator iterator= fFilterItems.values().iterator(); iterator.hasNext();) {
>+				FilterItem item= (FilterItem) iterator.next();
>+				if (item.descriptor.isCustomFilter()) {
>+					if (item.enabled != item.previouslyEnabled) {
>+						hasChange = true;
>+					}
>+					if (item.enabled){
>+						ViewerFilter filter= item.getFilterInstance(); // only create when changed
>+						if (filter != null) {
>+							viewerFilters.add(filter);
>+						}
>+					}
>+				} else if (item.descriptor.isPatternFilter()) {
>+					if (item.enabled) {
>+						patterns.add(item.descriptor.getPattern());
>+					}
>+					patternChange |= (item.enabled != item.previouslyEnabled);
>+				}
>+				item.previouslyEnabled= item.enabled;
>+			}
>+
>+			if (areUserDefinedPatternsEnabled()) {
>+				for (int i= 0; i < fUserDefinedPatterns.length; i++) {
>+					patterns.add(fUserDefinedPatterns[i]);
>+				}
>+			}
>+			if (!patternChange) { // no pattern change so far, test if the user patterns made a difference
>+				patternChange= hasChanges(patterns, fPreviousPatterns);
>+			}
>+
>+			fPreviousPatterns= (String[]) patterns.toArray(new String[patterns.size()]);
>+			if (patternChange) {
>+				fPatternFilter.setPatterns(fPreviousPatterns);
>+				if (patterns.isEmpty()) {
>+					viewerFilters.remove(fPatternFilter);
>+				} else if (!viewerFilters.contains(fPatternFilter)) {
>+					boolean contains = false;
>+					for (int i=0; i< viewerFilters.size();i++){
>+						if (viewerFilters.get(i) instanceof OutlineNamePatternFilter){
>+							OutlineNamePatternFilter filter = (OutlineNamePatternFilter)viewerFilters.get(i);
>+							String[] a1 =filter.getPatterns();
>+							String[] a2 =fPatternFilter.getPatterns();
>+							if (a1[0].equals(a2[0]))
>+								contains= true;
>+							else {
>+								viewerFilters.remove(i);
>+							}
>+							break;
>+						}
>+					}
>+					if (!contains)
>+						viewerFilters.add(fPatternFilter);
>+				}
>+				hasChange= true;
>+			}
>+			if (hasChange) {
>+				fViewer.setFilters((ViewerFilter[]) viewerFilters.toArray(new ViewerFilter[viewerFilters.size()])); // will refresh
>+			}
>+			return hasChange;
>+		}
>+
>+		private boolean hasChanges(HashSet patterns, String[] oldPatterns) {
>+			HashSet copy= (HashSet) patterns.clone();
>+			for (int i= 0; i < oldPatterns.length; i++) {
>+				boolean found= copy.remove(oldPatterns[i]);
>+				if (!found)
>+					return true;
>+			}
>+			return !copy.isEmpty();
>+		}
>+
>+		// ---------- view kind/defaults persistency ----------
>+
>+		private void initializeWithViewDefaults() {
>+			// get default values for view
>+			
>+			
>+			fUserDefinedPatternsEnabled= fStore.getBoolean(getPreferenceKey(TAG_USER_DEFINED_PATTERNS_ENABLED));
>+			setUserDefinedPatterns(OutlineCustomFiltersDialog.convertFromString(fStore.getString(getPreferenceKey(TAG_USER_DEFINED_PATTERNS)), SEPARATOR));
>+
>+			for (Iterator iterator= fFilterItems.values().iterator(); iterator.hasNext();) {
>+				FilterItem item= (FilterItem) iterator.next();
>+				String id= item.id;
>+				// set default to value from plugin contributions (fixes https://bugs.eclipse.org/bugs/show_bug.cgi?id=73991 ):
>+				fStore.setDefault(id, item.descriptor.isEnabled());
>+				item.enabled= fStore.getBoolean(id);
>+			}
>+		
>+		}
>+
>+		private void storeViewDefaults() {
>+			// get default values for view
>+			
>+			fStore.setValue(getPreferenceKey(TAG_USER_DEFINED_PATTERNS_ENABLED), fUserDefinedPatternsEnabled);
>+			fStore.setValue(getPreferenceKey(TAG_USER_DEFINED_PATTERNS), OutlineCustomFiltersDialog.convertToString(fUserDefinedPatterns ,SEPARATOR));
>+
>+			boolean fFilterSelected = false;
>+			for (Iterator iterator= fFilterItems.values().iterator(); iterator.hasNext();) {
>+				FilterItem item= (FilterItem) iterator.next();
>+				fStore.setValue(item.id, item.enabled);
>+				if (item.enabled)
>+					fFilterSelected = true;
>+			}
>+
>+			fStore.setValue(fTargetId, fUserDefinedPatternsEnabled || fFilterSelected);
>+			
>+		}
>+
>+		private String getPreferenceKey(String tag) {
>+			return "CustomFiltersActionGroup." + fTargetId + '.' + tag; //$NON-NLS-1$
>+		}
>+
>+		
>+		public void openDialog() {
>+			OutlineCustomFiltersDialog dialog= new OutlineCustomFiltersDialog(
>+				fViewer.getControl().getShell(),
>+				fTargetId,
>+				areUserDefinedPatternsEnabled(),
>+				fUserDefinedPatterns,
>+				internalGetEnabledFilterIds());
>+
>+			if (dialog.open() == Window.OK) {
>+
>+				setEnabledFilterIds(dialog.getEnabledFilterIds());
>+				setUserDefinedPatternsEnabled(dialog.areUserDefinedPatternsEnabled());
>+				setUserDefinedPatterns(dialog.getUserDefinedPatterns());
>+				storeViewDefaults();
>+
>+				updateViewerFilters();
>+			}
>+			else {
>+				storeViewDefaults();
>+			}
>+		}
>+	}
>+
>Index: src/org/eclipse/wst/sse/ui/internal/filter/OutlineCustomFiltersDialog.java
>===================================================================
>RCS file: src/org/eclipse/wst/sse/ui/internal/filter/OutlineCustomFiltersDialog.java
>diff -N src/org/eclipse/wst/sse/ui/internal/filter/OutlineCustomFiltersDialog.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/wst/sse/ui/internal/filter/OutlineCustomFiltersDialog.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,416 @@
>+/*******************************************************************************
>+ * Copyright (c) 2010 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:
>+ * IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.wst.sse.ui.internal.filter;
>+
>+import java.util.ArrayList;
>+import java.util.Arrays;
>+import java.util.HashSet;
>+import java.util.Iterator;
>+import java.util.List;
>+import java.util.Set;
>+import java.util.Stack;
>+import java.util.StringTokenizer;
>+
>+import org.eclipse.core.runtime.Assert;
>+import org.eclipse.jface.dialogs.IDialogConstants;
>+import org.eclipse.jface.viewers.ArrayContentProvider;
>+import org.eclipse.jface.viewers.CheckStateChangedEvent;
>+import org.eclipse.jface.viewers.CheckboxTableViewer;
>+import org.eclipse.jface.viewers.ICheckStateListener;
>+import org.eclipse.jface.viewers.ILabelProvider;
>+import org.eclipse.jface.viewers.ISelection;
>+import org.eclipse.jface.viewers.ISelectionChangedListener;
>+import org.eclipse.jface.viewers.IStructuredSelection;
>+import org.eclipse.jface.viewers.LabelProvider;
>+import org.eclipse.jface.viewers.SelectionChangedEvent;
>+import org.eclipse.swt.SWT;
>+import org.eclipse.swt.events.SelectionAdapter;
>+import org.eclipse.swt.events.SelectionEvent;
>+import org.eclipse.swt.events.SelectionListener;
>+import org.eclipse.swt.graphics.Image;
>+import org.eclipse.swt.layout.GridData;
>+import org.eclipse.swt.layout.GridLayout;
>+import org.eclipse.swt.widgets.Button;
>+import org.eclipse.swt.widgets.Composite;
>+import org.eclipse.swt.widgets.Control;
>+import org.eclipse.swt.widgets.Label;
>+import org.eclipse.swt.widgets.Shell;
>+import org.eclipse.swt.widgets.Text;
>+import org.eclipse.ui.PlatformUI;
>+import org.eclipse.ui.dialogs.SelectionDialog;
>+import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
>+
>+
>+public class OutlineCustomFiltersDialog extends SelectionDialog {
>+
>+	private static final String SEPARATOR= ","; //$NON-NLS-1$
>+
>+	private String fViewId;
>+	private boolean fEnablePatterns;
>+	private String[] fPatterns;
>+	private String[] fEnabledFilterIds;
>+
>+	private OutlineFilterDescriptor[] fBuiltInFilters;
>+
>+	private CheckboxTableViewer fCheckBoxList;
>+	private Button fEnableUserDefinedPatterns;
>+	private Text fUserDefinedPatterns;
>+
>+	private Stack fFilterDescriptorChangeHistory;
>+
>+
>+	/**
>+	 * Creates a dialog to customize Java element filters.
>+	 *
>+	 * @param shell the parent shell
>+	 * @param viewId the id of the view
>+	 * @param enablePatterns <code>true</code> if pattern filters are enabled
>+	 * @param patterns the filter patterns
>+	 * @param enabledFilterIds the Ids of the enabled filters
>+	 */
>+	public OutlineCustomFiltersDialog(
>+			Shell shell,
>+			String viewId,
>+			boolean enablePatterns,
>+			String[] patterns,
>+			String[] enabledFilterIds) {
>+
>+		super(shell);
>+		Assert.isNotNull(viewId);
>+		Assert.isNotNull(patterns);
>+		Assert.isNotNull(enabledFilterIds);
>+
>+		fViewId= viewId;
>+		fPatterns= patterns;
>+		fEnablePatterns= enablePatterns;
>+		fEnabledFilterIds= enabledFilterIds;
>+
>+		fBuiltInFilters= OutlineFilterDescriptor.getFilterDescriptors(fViewId);
>+		fFilterDescriptorChangeHistory= new Stack();
>+	}
>+	public static final String CUSTOM_FILTERS_DIALOG= SSEUIPlugin.ID + "." + "open_custom_filters_dialog_context"; //$NON-NLS-1$
>+	protected void configureShell(Shell shell) {
>+		setTitle(OutlineFilterMessages.CustomFiltersDialog_title);
>+		setMessage(OutlineFilterMessages.CustomFiltersDialog_filterList_label);
>+		super.configureShell(shell);
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(shell, CUSTOM_FILTERS_DIALOG);
>+	}
>+
>+	/**
>+	 * Overrides method in Dialog
>+	 *
>+	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(Composite)
>+	 */
>+	protected Control createDialogArea(Composite parent) {
>+		initializeDialogUnits(parent);
>+		// create a composite with standard margins and spacing
>+		Composite composite= new Composite(parent, SWT.NONE);
>+		GridLayout layout= new GridLayout();
>+		layout.marginHeight= convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
>+		layout.marginWidth= convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
>+		layout.verticalSpacing= convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
>+		layout.horizontalSpacing= convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
>+		composite.setLayout(layout);
>+		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
>+		composite.setFont(parent.getFont());
>+		Composite group= composite;
>+
>+		// Checkbox
>+		fEnableUserDefinedPatterns= new Button(group, SWT.CHECK);
>+		fEnableUserDefinedPatterns.setFocus();
>+		fEnableUserDefinedPatterns.setText(OutlineFilterMessages.CustomFiltersDialog_enableUserDefinedPattern);
>+
>+		// Pattern	field
>+		fUserDefinedPatterns= new Text(group, SWT.SINGLE | SWT.BORDER);
>+		GridData data= new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
>+		data.widthHint= convertWidthInCharsToPixels(59);
>+		fUserDefinedPatterns.setLayoutData(data);
>+		String patterns= convertToString(fPatterns, SEPARATOR);
>+		fUserDefinedPatterns.setText(patterns);
>+		SWTUtil.setAccessibilityText(fUserDefinedPatterns, OutlineFilterMessages.CustomFiltersDialog_name_filter_pattern_description);
>+
>+		// Info text
>+		final Label info= new Label(group, SWT.LEFT);
>+		info.setText(OutlineFilterMessages.CustomFiltersDialog_patternInfo);
>+
>+		// Enabling / disabling of pattern group
>+		fEnableUserDefinedPatterns.setSelection(fEnablePatterns);
>+		fUserDefinedPatterns.setEnabled(fEnablePatterns);
>+		info.setEnabled(fEnablePatterns);
>+		fEnableUserDefinedPatterns.addSelectionListener(new SelectionAdapter() {
>+			public void widgetSelected(SelectionEvent e) {
>+				boolean state= fEnableUserDefinedPatterns.getSelection();
>+				fUserDefinedPatterns.setEnabled(state);
>+				info.setEnabled(fEnableUserDefinedPatterns.getSelection());
>+				if (state)
>+					fUserDefinedPatterns.setFocus();
>+			}
>+		});
>+
>+		// Filters provided by extension point
>+		if (fBuiltInFilters.length > 0)
>+			createCheckBoxList(group);
>+
>+		applyDialogFont(parent);
>+		return parent;
>+	}
>+
>+	private void createCheckBoxList(Composite parent) {
>+		// Filler
>+		new Label(parent, SWT.NONE);
>+
>+		Label info= new Label(parent, SWT.LEFT);
>+		info.setText(OutlineFilterMessages.CustomFiltersDialog_filterList_label);
>+
>+		fCheckBoxList= CheckboxTableViewer.newCheckList(parent, SWT.BORDER);
>+		GridData data= new GridData(GridData.FILL_BOTH);
>+		data.heightHint= fCheckBoxList.getTable().getItemHeight() * 10;
>+		fCheckBoxList.getTable().setLayoutData(data);
>+
>+		fCheckBoxList.setLabelProvider(createLabelPrivder());
>+		fCheckBoxList.setContentProvider(new ArrayContentProvider());
>+		Arrays.sort(fBuiltInFilters);
>+		fCheckBoxList.setInput(fBuiltInFilters);
>+		setInitialSelections(getEnabledFilterDescriptors());
>+
>+		List initialSelection= getInitialElementSelections();
>+		if (initialSelection != null && !initialSelection.isEmpty())
>+			checkInitialSelections();
>+
>+		// Description
>+		info= new Label(parent, SWT.LEFT);
>+		info.setText(OutlineFilterMessages.CustomFiltersDialog_description_label);
>+		final Text description= new Text(parent, SWT.LEFT | SWT.WRAP | SWT.MULTI | SWT.READ_ONLY | SWT.BORDER | SWT.V_SCROLL);
>+		data = new GridData(GridData.FILL_HORIZONTAL);
>+		data.heightHint= convertHeightInCharsToPixels(3);
>+		description.setLayoutData(data);
>+		fCheckBoxList.addSelectionChangedListener(new ISelectionChangedListener() {
>+			public void selectionChanged(SelectionChangedEvent event) {
>+				ISelection selection= event.getSelection();
>+				if (selection instanceof IStructuredSelection) {
>+					Object selectedElement= ((IStructuredSelection)selection).getFirstElement();
>+					if (selectedElement instanceof OutlineFilterDescriptor)
>+						description.setText(((OutlineFilterDescriptor)selectedElement).getDescription());
>+				}
>+			}
>+		});
>+		fCheckBoxList.addCheckStateListener(new ICheckStateListener() {
>+			/*
>+			 * @see org.eclipse.jface.viewers.ICheckStateListener#checkStateChanged(org.eclipse.jface.viewers.CheckStateChangedEvent)
>+			 */
>+			public void checkStateChanged(CheckStateChangedEvent event) {
>+				Object element= event.getElement();
>+				if (element instanceof OutlineFilterDescriptor) {
>+					// renew if already touched
>+					if (fFilterDescriptorChangeHistory.contains(element))
>+						fFilterDescriptorChangeHistory.remove(element);
>+					fFilterDescriptorChangeHistory.push(element);
>+				}
>+			}});
>+
>+		addSelectionButtons(parent);
>+	}
>+
>+	private void addSelectionButtons(Composite composite) {
>+		Composite buttonComposite= new Composite(composite, SWT.RIGHT);
>+		GridLayout layout= new GridLayout();
>+		layout.numColumns= 2;
>+		buttonComposite.setLayout(layout);
>+		GridData data= new GridData(GridData.HORIZONTAL_ALIGN_END | GridData.GRAB_HORIZONTAL);
>+		data.grabExcessHorizontalSpace= true;
>+		composite.setData(data);
>+
>+		// Select All button
>+		String label= OutlineFilterMessages.CustomFiltersDialog_SelectAllButton_label;
>+		Button selectButton= createButton(buttonComposite, IDialogConstants.SELECT_ALL_ID, label, false);
>+		SWTUtil.setButtonDimensionHint(selectButton);
>+		SelectionListener listener= new SelectionAdapter() {
>+			public void widgetSelected(SelectionEvent e) {
>+				fCheckBoxList.setAllChecked(true);
>+				fFilterDescriptorChangeHistory.clear();
>+				for (int i= 0; i < fBuiltInFilters.length; i++)
>+					fFilterDescriptorChangeHistory.push(fBuiltInFilters[i]);
>+			}
>+		};
>+		selectButton.addSelectionListener(listener);
>+
>+		// De-select All button
>+		label= OutlineFilterMessages.CustomFiltersDialog_DeselectAllButton_label;
>+		Button deselectButton= createButton(buttonComposite, IDialogConstants.DESELECT_ALL_ID, label, false);
>+		SWTUtil.setButtonDimensionHint(deselectButton);
>+		listener= new SelectionAdapter() {
>+			public void widgetSelected(SelectionEvent e) {
>+				fCheckBoxList.setAllChecked(false);
>+				fFilterDescriptorChangeHistory.clear();
>+				for (int i= 0; i < fBuiltInFilters.length; i++)
>+					fFilterDescriptorChangeHistory.push(fBuiltInFilters[i]);
>+			}
>+		};
>+		deselectButton.addSelectionListener(listener);
>+	}
>+
>+	private void checkInitialSelections() {
>+		Iterator itemsToCheck= getInitialElementSelections().iterator();
>+		while (itemsToCheck.hasNext())
>+			fCheckBoxList.setChecked(itemsToCheck.next(),true);
>+	}
>+
>+	protected void okPressed() {
>+		if (fBuiltInFilters != null) {
>+			ArrayList result= new ArrayList();
>+			for (int i= 0; i < fBuiltInFilters.length; ++i) {
>+				if (fCheckBoxList.getChecked(fBuiltInFilters[i]))
>+					result.add(fBuiltInFilters[i]);
>+			}
>+			setResult(result);
>+		}
>+		super.okPressed();
>+	}
>+
>+	private ILabelProvider createLabelPrivder() {
>+		return
>+			new LabelProvider() {
>+				public Image getImage(Object element) {
>+					return null;
>+				}
>+				public String getText(Object element) {
>+					if (element instanceof OutlineFilterDescriptor)
>+						return ((OutlineFilterDescriptor)element).getName();
>+					else
>+						return null;
>+				}
>+			};
>+	}
>+
>+	// ---------- result handling ----------
>+
>+	protected void setResult(List newResult) {
>+		super.setResult(newResult);
>+		if (fUserDefinedPatterns.getText().length() > 0) {
>+			fEnablePatterns= fEnableUserDefinedPatterns.getSelection();
>+			fPatterns= convertFromString(fUserDefinedPatterns.getText(), SEPARATOR);
>+		} else {
>+			fEnablePatterns= false;
>+			fPatterns= new String[0];
>+		}
>+	}
>+
>+
>+	/**
>+	 * @return the patterns which have been entered by the user
>+	 */
>+	public String[] getUserDefinedPatterns() {
>+		return fPatterns;
>+	}
>+
>+	/**
>+	 * @return the Ids of the enabled built-in filters
>+	 */
>+	public String[] getEnabledFilterIds() {
>+		Object[] result= getResult();
>+		Set enabledIds= new HashSet(result.length);
>+		for (int i= 0; i < result.length; i++)
>+			enabledIds.add(((OutlineFilterDescriptor)result[i]).getId());
>+		return (String[]) enabledIds.toArray(new String[enabledIds.size()]);
>+	}
>+
>+	/**
>+	 * @return <code>true</code> if the user-defined patterns are disabled
>+	 */
>+	public boolean areUserDefinedPatternsEnabled() {
>+		return fEnablePatterns;
>+	}
>+
>+	/**
>+	 * @return a stack with the filter descriptor check history
>+	 */
>+	public Stack getFilterDescriptorChangeHistory() {
>+		return fFilterDescriptorChangeHistory;
>+	}
>+
>+	private OutlineFilterDescriptor[] getEnabledFilterDescriptors() {
>+		OutlineFilterDescriptor[] filterDescs= fBuiltInFilters;
>+		List result= new ArrayList(filterDescs.length);
>+		List enabledFilterIds= Arrays.asList(fEnabledFilterIds);
>+		for (int i= 0; i < filterDescs.length; i++) {
>+			String id= filterDescs[i].getId();
>+			if (enabledFilterIds.contains(id))
>+				result.add(filterDescs[i]);
>+		}
>+		return (OutlineFilterDescriptor[])result.toArray(new OutlineFilterDescriptor[result.size()]);
>+	}
>+
>+
>+	public static String[] convertFromString(String patterns, String separator) {
>+		StringTokenizer tokenizer= new StringTokenizer(patterns, separator, true);
>+		int tokenCount= tokenizer.countTokens();
>+		List result= new ArrayList(tokenCount);
>+		boolean escape= false;
>+		boolean append= false;
>+		while (tokenizer.hasMoreTokens()) {
>+			String token= tokenizer.nextToken().trim();
>+			if (separator.equals(token)) {
>+				if (!escape)
>+					escape= true;
>+				else {
>+					addPattern(result, separator);
>+					append= true;
>+				}
>+			} else {
>+				if (!append)
>+ 					result.add(token);
>+				else
>+					addPattern(result, token);
>+				append= false;
>+				escape= false;
>+			}
>+		}
>+		return (String[])result.toArray(new String[result.size()]);
>+	}
>+
>+	private static void addPattern(List list, String pattern) {
>+		if (list.isEmpty())
>+			list.add(pattern);
>+		else {
>+			int index= list.size() - 1;
>+			list.set(index, ((String)list.get(index)) + pattern);
>+		}
>+	}
>+
>+	public static String convertToString(String[] patterns, String separator) {
>+		int length= patterns.length;
>+		StringBuffer strBuf= new StringBuffer();
>+		if (length > 0)
>+			strBuf.append(escapeSeparator(patterns[0], separator));
>+		else
>+			return ""; //$NON-NLS-1$
>+		int i= 1;
>+		while (i < length) {
>+			strBuf.append(separator);
>+			strBuf.append(" "); //$NON-NLS-1$
>+			strBuf.append(escapeSeparator(patterns[i++], separator));
>+		}
>+		return strBuf.toString();
>+	}
>+
>+	private static String escapeSeparator(String pattern, String separator) {
>+		int length= pattern.length();
>+		StringBuffer buf= new StringBuffer(length);
>+		for (int i= 0; i < length; i++) {
>+			char ch= pattern.charAt(i);
>+			if (separator.equals(String.valueOf(ch)))
>+				buf.append(ch);
>+			buf.append(ch);
>+		}
>+		return buf.toString();
>+
>+	}
>+}
>Index: src/org/eclipse/wst/sse/ui/internal/filter/OutlineFilterDescriptor.java
>===================================================================
>RCS file: src/org/eclipse/wst/sse/ui/internal/filter/OutlineFilterDescriptor.java
>diff -N src/org/eclipse/wst/sse/ui/internal/filter/OutlineFilterDescriptor.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/wst/sse/ui/internal/filter/OutlineFilterDescriptor.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,277 @@
>+/*******************************************************************************
>+ * Copyright (c) 2010 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:
>+ * IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.wst.sse.ui.internal.filter;
>+
>+import java.util.ArrayList;
>+import java.util.HashSet;
>+import java.util.List;
>+import java.util.Set;
>+
>+import com.ibm.icu.text.Collator;
>+
>+import org.eclipse.core.runtime.Assert;
>+import org.eclipse.core.runtime.IConfigurationElement;
>+import org.eclipse.core.runtime.IExtensionRegistry;
>+import org.eclipse.core.runtime.ISafeRunnable;
>+import org.eclipse.core.runtime.Platform;
>+import org.eclipse.core.runtime.SafeRunner;
>+
>+import org.eclipse.jface.util.SafeRunnable;
>+import org.eclipse.jface.viewers.ViewerFilter;
>+
>+import org.eclipse.ui.IPluginContribution;
>+import org.eclipse.ui.activities.WorkbenchActivityHelper;
>+import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
>+
>+
>+
>+/**
>+ * Represents a custom filter which is provided by the
>+ * "org.eclipse.jdt.ui.javaElementFilters" extension point.
>+ *
>+ */
>+public class OutlineFilterDescriptor implements Comparable, IPluginContribution {
>+
>+	private static String PATTERN_FILTER_ID_PREFIX= "_patternFilterId_"; //$NON-NLS-1$
>+
>+
>+	private static final String EXTENSION_POINT_NAME= "outlineElementFilter"; //$NON-NLS-1$
>+
>+	private static final String FILTER_TAG= "filter"; //$NON-NLS-1$
>+
>+	private static final String PATTERN_ATTRIBUTE= "pattern"; //$NON-NLS-1$
>+	private static final String ID_ATTRIBUTE= "id"; //$NON-NLS-1$
>+	private static final String TARGET_ID_ATTRIBUTE= "targetId"; //$NON-NLS-1$
>+	private static final String CLASS_ATTRIBUTE= "class"; //$NON-NLS-1$
>+	private static final String NAME_ATTRIBUTE= "name"; //$NON-NLS-1$
>+	private static final String ENABLED_ATTRIBUTE= "enabled"; //$NON-NLS-1$
>+	private static final String DESCRIPTION_ATTRIBUTE= "description"; //$NON-NLS-1$
>+	
>+	private static OutlineFilterDescriptor[] fgFilterDescriptors;
>+
>+
>+	private IConfigurationElement fElement;
>+
>+	/**
>+	 * Returns all contributed Java element filters.
>+	 * @return all contributed Java element filters
>+	 */
>+	public static OutlineFilterDescriptor[] getFilterDescriptors() {
>+		if (fgFilterDescriptors == null) {
>+			IExtensionRegistry registry= Platform.getExtensionRegistry();
>+			IConfigurationElement[] elements= registry.getConfigurationElementsFor(SSEUIPlugin.ID, EXTENSION_POINT_NAME);
>+			fgFilterDescriptors= createFilterDescriptors(elements);
>+		}
>+		return fgFilterDescriptors;
>+	}
>+	/**
>+	 * Returns all Java element filters which
>+	 * are contributed to the given view.
>+	 * @param targetId the target id
>+	 * @return all contributed Java element filters for the given view
>+	 */
>+	public static OutlineFilterDescriptor[] getFilterDescriptors(String targetId) {
>+		OutlineFilterDescriptor[] filterDescs= OutlineFilterDescriptor.getFilterDescriptors();
>+		List result= new ArrayList(filterDescs.length);
>+		for (int i= 0; i < filterDescs.length; i++) {
>+			String tid= filterDescs[i].getTargetId();
>+			if (WorkbenchActivityHelper.filterItem(filterDescs[i]))
>+				continue;
>+			if (tid == null || tid.equals(targetId))
>+				result.add(filterDescs[i]);
>+		}
>+		return (OutlineFilterDescriptor[])result.toArray(new OutlineFilterDescriptor[result.size()]);
>+	}
>+
>+	/**
>+	 * Creates a new filter descriptor for the given configuration element.
>+	 * @param element configuration element
>+	 */
>+	private OutlineFilterDescriptor(IConfigurationElement element) {
>+		fElement= element;
>+		// it is either a pattern filter or a custom filter
>+		Assert.isTrue(isPatternFilter() ^ isCustomFilter(), "An extension for extension-point org.eclipse.jdt.ui.javaElementFilters does not specify a correct filter"); //$NON-NLS-1$
>+		Assert.isNotNull(getId(), "An extension for extension-point org.eclipse.jdt.ui.javaElementFilters does not provide a valid ID"); //$NON-NLS-1$
>+		Assert.isNotNull(getName(), "An extension for extension-point org.eclipse.jdt.ui.javaElementFilters does not provide a valid name"); //$NON-NLS-1$
>+	}
>+
>+	/**
>+	 * Creates a new <code>ViewerFilter</code>.
>+	 * This method is only valid for viewer filters.
>+	 * @return a new <code>ViewerFilter</code>
>+	 */
>+	public ViewerFilter createViewerFilter() {
>+		if (!isCustomFilter())
>+			return null;
>+
>+		final ViewerFilter[] result= new ViewerFilter[1];
>+		String message = OutlineFilterMessages.FilterDescriptor_filterCreationError_message;
>+		ISafeRunnable code= new SafeRunnable(message) {
>+			/*
>+			 * @see org.eclipse.core.runtime.ISafeRunnable#run()
>+			 */
>+			public void run() throws Exception {
>+				result[0]= (ViewerFilter)fElement.createExecutableExtension(CLASS_ATTRIBUTE);
>+			}
>+
>+		};
>+		SafeRunner.run(code);
>+		return result[0];
>+	}
>+
>+	//---- XML Attribute accessors ---------------------------------------------
>+
>+	/**
>+	 * Returns the filter's id.
>+	 * 
>+	 * This attribute is mandatory for custom filters.
>+	 * The ID for pattern filters is
>+	 * PATTERN_FILTER_ID_PREFIX plus the pattern itself.
>+	 * 
>+	 * @return the filter id
>+	 */
>+	public String getId() {
>+		if (isPatternFilter()) {
>+			String targetId= getTargetId();
>+			if (targetId == null)
>+				return PATTERN_FILTER_ID_PREFIX + getPattern();
>+			else
>+				return targetId + PATTERN_FILTER_ID_PREFIX + getPattern();
>+		} else
>+			return fElement.getAttribute(ID_ATTRIBUTE);
>+	}
>+
>+	/**
>+	 * Returns the filter's name.
>+	 * 
>+	 * If the name of a pattern filter is missing
>+	 * then the pattern is used as its name.
>+	 * 
>+	 * @return the filter's name
>+	 */
>+	public String getName() {
>+		String name= fElement.getAttribute(NAME_ATTRIBUTE);
>+		if (name == null && isPatternFilter())
>+			name= getPattern();
>+		return name;
>+	}
>+
>+	/**
>+	 * Returns the filter's pattern.
>+	 *
>+	 * @return the pattern string or <code>null</code> if it's not a pattern filter
>+	 */
>+	public String getPattern() {
>+		return fElement.getAttribute(PATTERN_ATTRIBUTE);
>+	}
>+
>+	/**
>+	 * Returns the filter's viewId.
>+	 *
>+	 * @return the view ID or <code>null</code> if the filter is for all views
>+	 */
>+	public String getTargetId() {
>+		String tid= fElement.getAttribute(TARGET_ID_ATTRIBUTE);
>+
>+		if (tid != null)
>+			return tid;
>+
>+		// Backwards compatibility code
>+		return null;
>+
>+	}
>+
>+	/**
>+	 * Returns the filter's description.
>+	 *
>+	 * @return the description or <code>null</code> if no description is provided
>+	 */
>+	public String getDescription() {
>+		String description= fElement.getAttribute(DESCRIPTION_ATTRIBUTE);
>+		if (description == null)
>+			description= ""; //$NON-NLS-1$
>+		return description;
>+	}
>+
>+	/**
>+	 * @return <code>true</code> if this filter is a custom filter.
>+	 */
>+	public boolean isPatternFilter() {
>+		return getPattern() != null;
>+	}
>+
>+	/**
>+	 * @return <code>true</code> if this filter is a pattern filter.
>+	 */
>+	public boolean isCustomFilter() {
>+		return fElement.getAttribute(CLASS_ATTRIBUTE) != null;
>+	}
>+
>+	/**
>+	 * Returns <code>true</code> if the filter
>+	 * is initially enabled.
>+	 *
>+	 * This attribute is optional and defaults to <code>true</code>.
>+	 * @return returns <code>true</code> if the filter is initially enabled
>+	 */
>+	public boolean isEnabled() {
>+		String strVal= fElement.getAttribute(ENABLED_ATTRIBUTE);
>+		return strVal == null || Boolean.valueOf(strVal).booleanValue();
>+	}
>+
>+	/*
>+	 * Implements a method from IComparable
>+	 */
>+	public int compareTo(Object o) {
>+		if (o instanceof OutlineFilterDescriptor)
>+			return Collator.getInstance().compare(getName(), ((OutlineFilterDescriptor)o).getName());
>+		else
>+			return Integer.MIN_VALUE;
>+	}
>+
>+	//---- initialization ---------------------------------------------------
>+
>+	/**
>+	 * Creates the filter descriptors.
>+	 * @param elements the configuration elements
>+	 * @return new filter descriptors
>+	 */
>+	private static OutlineFilterDescriptor[] createFilterDescriptors(IConfigurationElement[] elements) {
>+		List result= new ArrayList(5);
>+		Set descIds= new HashSet(5);
>+		for (int i= 0; i < elements.length; i++) {
>+			final IConfigurationElement element= elements[i];
>+			if (FILTER_TAG.equals(element.getName())) {
>+
>+				final OutlineFilterDescriptor[] desc= new OutlineFilterDescriptor[1];
>+				SafeRunner.run(new SafeRunnable(OutlineFilterMessages.FilterDescriptor_filterDescriptionCreationError_message) {
>+					public void run() throws Exception {
>+						desc[0]= new OutlineFilterDescriptor(element);
>+					}
>+				});
>+
>+				if (desc[0] != null && !descIds.contains(desc[0].getId())) {
>+					result.add(desc[0]);
>+					descIds.add(desc[0].getId());
>+				}
>+			}
>+		}
>+		return (OutlineFilterDescriptor[])result.toArray(new OutlineFilterDescriptor[result.size()]);
>+	}
>+
>+	public String getLocalId() {
>+		return fElement.getAttribute(ID_ATTRIBUTE);
>+	}
>+
>+ public String getPluginId() {
>+ return fElement.getContributor().getName();
>+ }
>+}
>Index: src/org/eclipse/wst/sse/ui/internal/filter/OutlineFilterMessages.java
>===================================================================
>RCS file: src/org/eclipse/wst/sse/ui/internal/filter/OutlineFilterMessages.java
>diff -N src/org/eclipse/wst/sse/ui/internal/filter/OutlineFilterMessages.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/wst/sse/ui/internal/filter/OutlineFilterMessages.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,38 @@
>+/*******************************************************************************
>+ * Copyright (c) 2010 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:
>+ * IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.wst.sse.ui.internal.filter;
>+
>+import org.eclipse.osgi.util.NLS;
>+
>+public final class OutlineFilterMessages extends NLS {
>+
>+	private static final String BUNDLE_NAME= "org.eclipse.wst.sse.ui.internal.filter.OutlineFilterMessages";//$NON-NLS-1$
>+
>+	private OutlineFilterMessages() {
>+		// Do not instantiate
>+	}
>+
>+	public static String CustomFiltersDialog_title;
>+	public static String CustomFiltersDialog_patternInfo;
>+	public static String CustomFiltersDialog_enableUserDefinedPattern;
>+	public static String CustomFiltersDialog_filterList_label;
>+	public static String CustomFiltersDialog_description_label;
>+	public static String CustomFiltersDialog_SelectAllButton_label;
>+	public static String CustomFiltersDialog_DeselectAllButton_label;
>+	public static String CustomFiltersDialog_name_filter_pattern_description;
>+	public static String OpenCustomFiltersDialogAction_text;
>+	public static String FilterDescriptor_filterDescriptionCreationError_message;
>+	public static String FilterDescriptor_filterCreationError_message;
>+
>+	static {
>+		NLS.initializeMessages(BUNDLE_NAME, OutlineFilterMessages.class);
>+	}
>+}
>Index: src/org/eclipse/wst/sse/ui/internal/filter/OutlineFilterMessages.properties
>===================================================================
>RCS file: src/org/eclipse/wst/sse/ui/internal/filter/OutlineFilterMessages.properties
>diff -N src/org/eclipse/wst/sse/ui/internal/filter/OutlineFilterMessages.properties
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/wst/sse/ui/internal/filter/OutlineFilterMessages.properties	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,24 @@
>+###############################################################################
>+# Copyright (c) 2010 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:
>+# IBM Corporation - initial API and implementation
>+###############################################################################
>+
>+CustomFiltersDialog_title= Java Element Filters
>+CustomFiltersDialog_patternInfo= The patterns are separated by comma, where\n* = any string, ? = any character, ,, = ,
>+CustomFiltersDialog_enableUserDefinedPattern= &Name filter patterns (matching names will be hidden):
>+CustomFiltersDialog_filterList_label= S&elect the elements to exclude from the view:
>+CustomFiltersDialog_description_label= Filter description:
>+CustomFiltersDialog_SelectAllButton_label= &Select All
>+CustomFiltersDialog_DeselectAllButton_label= &Deselect All
>+CustomFiltersDialog_name_filter_pattern_description=Name filter patterns. The patterns are separated by comma, where star is any string
>+
>+OpenCustomFiltersDialogAction_text= &Filters...
>+
>+FilterDescriptor_filterDescriptionCreationError_message= One of the extensions for extension-point org.eclipse.wst.sse.ui.outlineElementFilter is incorrect.
>+FilterDescriptor_filterCreationError_message= The org.eclipse.wst.sse.ui.sssElementFilters plug-in extension "{0}" specifies a viewer filter class which does not exist.
>Index: src/org/eclipse/wst/sse/ui/internal/filter/OutlineNamePatternFilter.java
>===================================================================
>RCS file: src/org/eclipse/wst/sse/ui/internal/filter/OutlineNamePatternFilter.java
>diff -N src/org/eclipse/wst/sse/ui/internal/filter/OutlineNamePatternFilter.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/wst/sse/ui/internal/filter/OutlineNamePatternFilter.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,80 @@
>+/*******************************************************************************
>+ * Copyright (c) 2010 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:
>+ * IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.wst.sse.ui.internal.filter;
>+
>+import org.eclipse.jface.viewers.Viewer;
>+import org.eclipse.jface.viewers.ViewerFilter;
>+import org.w3c.dom.Node;
>+
>+/**
>+ * The NamePatternFilter selects the elements which
>+ * match the given string patterns.
>+ * 
>+ * The following characters have special meaning:
>+ * ? => any character
>+ * * => any string
>+ * 
>+ *
>+ */
>+public class OutlineNamePatternFilter extends ViewerFilter {
>+	private String[] fPatterns;
>+	private StringMatcher[] fMatchers;
>+
>+
>+	/**
>+	 * Gets the patterns for the receiver.
>+	 * @return returns the patterns to be filtered for
>+	 */
>+	public String[] getPatterns() {
>+		return fPatterns;
>+	}
>+
>+
>+	/* (non-Javadoc)
>+	 * Method declared on ViewerFilter.
>+	 */
>+	public boolean select(Viewer viewer, Object parentElement, Object element) {
>+		if (getPatterns().length == 0) {
>+			return true;
>+		}
>+		String matchName= null;
>+		if (element instanceof Node){
>+			matchName =((Node)element).getNodeName();
>+		}
>+		if (matchName != null && matchName.length() > 0) {
>+			String[] fPatterns = getPatterns();
>+			for (int i = 0; i < fPatterns.length; i++) {
>+				if (new StringMatcher(fPatterns[i], true, false).match(matchName))
>+					return false;
>+			}
>+			return true;
>+		}
>+		return true;
>+	}
>+
>+	/**
>+	 * Sets the patterns to filter out for the receiver.
>+	 * 
>+	 * The following characters have special meaning:
>+	 * ? => any character
>+	 * * => any string
>+	 * 
>+	 * @param newPatterns the new patterns
>+	 */
>+	public void setPatterns(String[] newPatterns) {
>+		fPatterns = newPatterns;
>+		fMatchers = new StringMatcher[newPatterns.length];
>+		for (int i = 0; i < newPatterns.length; i++) {
>+			//Reset the matchers to prevent constructor overhead
>+			fMatchers[i]= new StringMatcher(newPatterns[i], true, false);
>+		}
>+	}
>+}
>Index: src/org/eclipse/wst/sse/ui/internal/filter/SWTUtil.java
>===================================================================
>RCS file: src/org/eclipse/wst/sse/ui/internal/filter/SWTUtil.java
>diff -N src/org/eclipse/wst/sse/ui/internal/filter/SWTUtil.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/wst/sse/ui/internal/filter/SWTUtil.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,156 @@
>+/*******************************************************************************
>+ * Copyright (c) 2010 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:
>+ * IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.wst.sse.ui.internal.filter;
>+
>+import org.eclipse.swt.SWT;
>+import org.eclipse.swt.accessibility.AccessibleAdapter;
>+import org.eclipse.swt.accessibility.AccessibleEvent;
>+import org.eclipse.swt.dnd.DragSource;
>+import org.eclipse.swt.dnd.DropTarget;
>+import org.eclipse.swt.layout.GridData;
>+import org.eclipse.swt.layout.GridLayout;
>+import org.eclipse.swt.widgets.Button;
>+import org.eclipse.swt.widgets.Caret;
>+import org.eclipse.swt.widgets.Combo;
>+import org.eclipse.swt.widgets.Control;
>+import org.eclipse.swt.widgets.Display;
>+import org.eclipse.swt.widgets.Menu;
>+import org.eclipse.swt.widgets.ScrollBar;
>+import org.eclipse.swt.widgets.Shell;
>+import org.eclipse.swt.widgets.Table;
>+import org.eclipse.swt.widgets.Widget;
>+
>+import org.eclipse.core.runtime.Assert;
>+
>+import org.eclipse.jface.dialogs.IDialogConstants;
>+import org.eclipse.jface.layout.PixelConverter;
>+import org.eclipse.jface.resource.JFaceResources;
>+
>+
>+/**
>+ * Utility class to simplify access to some SWT resources.
>+ */
>+public class SWTUtil {
>+
>+
>+	public static final int COMBO_VISIBLE_ITEM_COUNT= 30;
>+
>+	/**
>+	 * Returns the standard display to be used. The method first checks, if
>+	 * the thread calling this method has an associated display. If so, this
>+	 * display is returned. Otherwise the method returns the default display.
>+	 * @return returns the standard display to be used
>+	 */
>+	public static Display getStandardDisplay() {
>+		Display display;
>+		display= Display.getCurrent();
>+		if (display == null)
>+			display= Display.getDefault();
>+		return display;
>+	}
>+
>+	/**
>+	 * Returns the shell for the given widget. If the widget doesn't represent
>+	 * a SWT object that manage a shell, <code>null</code> is returned.
>+	 * @param widget the widget
>+	 *
>+	 * @return the shell for the given widget
>+	 */
>+	public static Shell getShell(Widget widget) {
>+		if (widget instanceof Control)
>+			return ((Control)widget).getShell();
>+		if (widget instanceof Caret)
>+			return ((Caret)widget).getParent().getShell();
>+		if (widget instanceof DragSource)
>+			return ((DragSource)widget).getControl().getShell();
>+		if (widget instanceof DropTarget)
>+			return ((DropTarget)widget).getControl().getShell();
>+		if (widget instanceof Menu)
>+			return ((Menu)widget).getParent().getShell();
>+		if (widget instanceof ScrollBar)
>+			return ((ScrollBar)widget).getParent().getShell();
>+
>+		return null;
>+	}
>+
>+
>+	/**
>+	 * Returns a width hint for a button control.
>+	 * @param button the button
>+	 * @return the width hint
>+	 */
>+	public static int getButtonWidthHint(Button button) {
>+		button.setFont(JFaceResources.getDialogFont());
>+		PixelConverter converter= new PixelConverter(button);
>+		int widthHint= converter.convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
>+		return Math.max(widthHint, button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
>+	}
>+
>+	/**
>+	 * Sets width and height hint for the button control.
>+	 * Note: This is a NOP if the button's layout data is not
>+	 * an instance of <code>GridData</code>.
>+	 *
>+	 * @param button	the button for which to set the dimension hint
>+	 */
>+	public static void setButtonDimensionHint(Button button) {
>+		Assert.isNotNull(button);
>+		Object gd= button.getLayoutData();
>+		if (gd instanceof GridData) {
>+			((GridData)gd).widthHint= getButtonWidthHint(button);
>+			((GridData)gd).horizontalAlignment = GridData.FILL;
>+		}
>+	}
>+
>+	public static int getTableHeightHint(Table table, int rows) {
>+		if (table.getFont().equals(JFaceResources.getDefaultFont()))
>+			table.setFont(JFaceResources.getDialogFont());
>+		int result= table.getItemHeight() * rows + table.getHeaderHeight();
>+		if (table.getLinesVisible())
>+			result+= table.getGridLineWidth() * (rows - 1);
>+		return result;
>+	}
>+
>+	/**
>+	 * Adds an accessibility listener returning the given fixed name.
>+	 *
>+	 * @param control the control to add the accessibility support to
>+	 * @param text the name
>+	 */
>+	public static void setAccessibilityText(Control control, final String text) {
>+		control.getAccessible().addAccessibleListener(new AccessibleAdapter() {
>+			public void getName(AccessibleEvent e) {
>+				e.result= text;
>+			}
>+		});
>+	}
>+
>+	/**
>+	 *
>+	 * @param combo the combo
>+	 *
>+	 * @see Combo#setVisibleItemCount(int)
>+	 * @see #COMBO_VISIBLE_ITEM_COUNT
>+	 *
>+	 */
>+	public static void setDefaultVisibleItemCount(Combo combo) {
>+		combo.setVisibleItemCount(COMBO_VISIBLE_ITEM_COUNT);
>+	}
>+
>+	public static GridLayout newLayoutNoMargins(int columns) {
>+		GridLayout layout= new GridLayout(columns, false);
>+		layout.marginWidth= 0;
>+		layout.marginHeight= 0;
>+		return layout;
>+	}
>+
>+
>+}
>Index: src/org/eclipse/wst/sse/ui/internal/filter/StringMatcher.java
>===================================================================
>RCS file: src/org/eclipse/wst/sse/ui/internal/filter/StringMatcher.java
>diff -N src/org/eclipse/wst/sse/ui/internal/filter/StringMatcher.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/wst/sse/ui/internal/filter/StringMatcher.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,384 @@
>+/*******************************************************************************
>+ * Copyright (c) 2010 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:
>+ * IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.wst.sse.ui.internal.filter;
>+
>+import java.util.Vector;
>+
>+/**
>+ * A string pattern matcher. Supports '*' and '?' wildcards.
>+ */
>+public class StringMatcher {
>+	protected String fPattern;
>+	protected int fLength; // pattern length
>+	protected boolean fIgnoreWildCards;
>+	protected boolean fIgnoreCase;
>+	protected boolean fHasLeadingStar;
>+	protected boolean fHasTrailingStar;
>+	protected String fSegments[]; //the given pattern is split into * separated segments
>+
>+	/* boundary value beyond which we don't need to search in the text */
>+	protected int fBound= 0;
>+
>+
>+	protected static final char fSingleWildCard= '\u0000';
>+
>+	public static class Position {
>+		int start; //inclusive
>+		int end; //exclusive
>+		public Position(int start, int end) {
>+			this.start= start;
>+			this.end= end;
>+		}
>+		public int getStart() {
>+			return start;
>+		}
>+		public int getEnd() {
>+			return end;
>+		}
>+	}
>+	/**
>+	 * StringMatcher constructor takes in a String object that is a simple
>+	 * pattern. The pattern may contain '*' for 0 and many characters and
>+	 * '?' for exactly one character.
>+	 *
>+	 * Literal '*' and '?' characters must be escaped in the pattern
>+	 * e.g., "\*" means literal "*", etc.
>+	 *
>+	 * Escaping any other character (including the escape character itself),
>+	 * just results in that character in the pattern.
>+	 * e.g., "\a" means "a" and "\\" means "\"
>+	 *
>+	 * If invoking the StringMatcher with string literals in Java, don't forget
>+	 * escape characters are represented by "\\".
>+	 *
>+	 * @param pattern the pattern to match text against
>+	 * @param ignoreCase if true, case is ignored
>+	 * @param ignoreWildCards if true, wild cards and their escape sequences are ignored
>+	 * 		 (everything is taken literally).
>+	 */
>+	public StringMatcher(String pattern, boolean ignoreCase, boolean ignoreWildCards) {
>+		if (pattern == null)
>+			throw new IllegalArgumentException();
>+		fIgnoreCase= ignoreCase;
>+		fIgnoreWildCards= ignoreWildCards;
>+		fPattern= pattern;
>+		fLength= pattern.length();
>+
>+		if (fIgnoreWildCards) {
>+			parseNoWildCards();
>+		} else {
>+			parseWildCards();
>+		}
>+	}
>+	/**
>+	 * Find the first occurrence of the pattern between <code>start</code)(inclusive)
>+	 * and <code>end</code>(exclusive).
>+	 * @param text the String object to search in
>+	 * @param start the starting index of the search range, inclusive
>+	 * @param end the ending index of the search range, exclusive
>+	 * @return an <code>StringMatcher.Position</code> object that keeps the starting
>+	 * (inclusive) and ending positions (exclusive) of the first occurrence of the
>+	 * pattern in the specified range of the text; return null if not found or subtext
>+	 * is empty (start==end). A pair of zeros is returned if pattern is empty string
>+	 * Note that for pattern like "*abc*" with leading and trailing stars, position of "abc"
>+	 * is returned. For a pattern like"*??*" in text "abcdf", (1,3) is returned
>+	 */
>+	public StringMatcher.Position find(String text, int start, int end) {
>+		if (text == null)
>+			throw new IllegalArgumentException();
>+
>+		int tlen= text.length();
>+		if (start < 0)
>+			start= 0;
>+		if (end > tlen)
>+			end= tlen;
>+		if (end < 0 ||start >= end )
>+			return null;
>+		if (fLength == 0)
>+			return new Position(start, start);
>+		if (fIgnoreWildCards) {
>+			int x= posIn(text, start, end);
>+			if (x < 0)
>+				return null;
>+			return new Position(x, x+fLength);
>+		}
>+
>+		int segCount= fSegments.length;
>+		if (segCount == 0)//pattern contains only '*'(s)
>+			return new Position (start, end);
>+
>+		int curPos= start;
>+		int matchStart= -1;
>+		int i;
>+		for (i= 0; i < segCount && curPos < end; ++i) {
>+			String current= fSegments[i];
>+			int nextMatch= regExpPosIn(text, curPos, end, current);
>+			if (nextMatch < 0 )
>+				return null;
>+			if(i == 0)
>+				matchStart= nextMatch;
>+			curPos= nextMatch + current.length();
>+		}
>+		if (i < segCount)
>+			return null;
>+		return new Position(matchStart, curPos);
>+	}
>+	/**
>+	 * match the given <code>text</code> with the pattern
>+	 * @return true if matched eitherwise false
>+	 * @param text a String object
>+	 */
>+	public boolean match(String text) {
>+		return match(text, 0, text.length());
>+	}
>+	/**
>+	 * Given the starting (inclusive) and the ending (exclusive) positions in the
>+	 * <code>text</code>, determine if the given substring matches with aPattern
>+	 * @return true if the specified portion of the text matches the pattern
>+	 * @param text a String object that contains the substring to match
>+	 * @param start marks the starting position (inclusive) of the substring
>+	 * @param end marks the ending index (exclusive) of the substring
>+	 */
>+	public boolean match(String text, int start, int end) {
>+		if (null == text)
>+			throw new IllegalArgumentException();
>+
>+		if (start > end)
>+			return false;
>+
>+		if (fIgnoreWildCards)
>+			return (end - start == fLength) && fPattern.regionMatches(fIgnoreCase, 0, text, start, fLength);
>+		int segCount= fSegments.length;
>+		if (segCount == 0 && (fHasLeadingStar || fHasTrailingStar)) // pattern contains only '*'(s)
>+			return true;
>+		if (start == end)
>+			return fLength == 0;
>+		if (fLength == 0)
>+			return start == end;
>+
>+		int tlen= text.length();
>+		if (start < 0)
>+			start= 0;
>+		if (end > tlen)
>+			end= tlen;
>+
>+		int tCurPos= start;
>+		int bound= end - fBound;
>+		if ( bound < 0)
>+			return false;
>+		int i=0;
>+		String current= fSegments[i];
>+		int segLength= current.length();
>+
>+		/* process first segment */
>+		if (!fHasLeadingStar){
>+			if(!regExpRegionMatches(text, start, current, 0, segLength)) {
>+				return false;
>+			} else {
>+				++i;
>+				tCurPos= tCurPos + segLength;
>+			}
>+		}
>+		if ((fSegments.length == 1) && (!fHasLeadingStar) && (!fHasTrailingStar)) {
>+			// only one segment to match, no wildcards specified
>+			return tCurPos == end;
>+		}
>+		/* process middle segments */
>+		while (i < segCount) {
>+			current= fSegments[i];
>+			int currentMatch;
>+			int k= current.indexOf(fSingleWildCard);
>+			if (k < 0) {
>+				currentMatch= textPosIn(text, tCurPos, end, current);
>+				if (currentMatch < 0)
>+					return false;
>+			} else {
>+				currentMatch= regExpPosIn(text, tCurPos, end, current);
>+				if (currentMatch < 0)
>+					return false;
>+			}
>+			tCurPos= currentMatch + current.length();
>+			i++;
>+		}
>+
>+		/* process final segment */
>+		if (!fHasTrailingStar && tCurPos != end) {
>+			int clen= current.length();
>+			return regExpRegionMatches(text, end - clen, current, 0, clen);
>+		}
>+		return i == segCount ;
>+	}
>+
>+	/**
>+	 * This method parses the given pattern into segments seperated by wildcard '*' characters.
>+	 * Since wildcards are not being used in this case, the pattern consists of a single segment.
>+	 */
>+	private void parseNoWildCards() {
>+		fSegments= new String[1];
>+		fSegments[0]= fPattern;
>+		fBound= fLength;
>+	}
>+	/**
>+	 * Parses the given pattern into segments seperated by wildcard '*' characters.
>+	 */
>+	private void parseWildCards() {
>+		if(fPattern.startsWith("*"))//$NON-NLS-1$
>+			fHasLeadingStar= true;
>+		if(fPattern.endsWith("*")) {//$NON-NLS-1$
>+			/* make sure it's not an escaped wildcard */
>+			if (fLength > 1 && fPattern.charAt(fLength - 2) != '\\') {
>+				fHasTrailingStar= true;
>+			}
>+		}
>+
>+		Vector temp= new Vector();
>+
>+		int pos= 0;
>+		StringBuffer buf= new StringBuffer();
>+		while (pos < fLength) {
>+			char c= fPattern.charAt(pos++);
>+			switch (c) {
>+				case '\\':
>+					if (pos >= fLength) {
>+						buf.append(c);
>+					} else {
>+						char next= fPattern.charAt(pos++);
>+						/* if it's an escape sequence */
>+						if (next == '*' || next == '?' || next == '\\') {
>+							buf.append(next);
>+						} else {
>+							/* not an escape sequence, just insert literally */
>+							buf.append(c);
>+							buf.append(next);
>+						}
>+					}
>+				break;
>+				case '*':
>+					if (buf.length() > 0) {
>+						/* new segment */
>+						temp.addElement(buf.toString());
>+						fBound += buf.length();
>+						buf.setLength(0);
>+					}
>+				break;
>+				case '?':
>+					/* append special character representing single match wildcard */
>+					buf.append(fSingleWildCard);
>+				break;
>+				default:
>+					buf.append(c);
>+			}
>+		}
>+
>+		/* add last buffer to segment list */
>+		if (buf.length() > 0) {
>+			temp.addElement(buf.toString());
>+			fBound += buf.length();
>+		}
>+
>+		fSegments= new String[temp.size()];
>+		temp.copyInto(fSegments);
>+	}
>+	/**
>+	 * @param text a string which contains no wildcard
>+	 * @param start the starting index in the text for search, inclusive
>+	 * @param end the stopping point of search, exclusive
>+	 * @return the starting index in the text of the pattern , or -1 if not found
>+	 */
>+	protected int posIn(String text, int start, int end) {//no wild card in pattern
>+		int max= end - fLength;
>+
>+		if (!fIgnoreCase) {
>+			int i= text.indexOf(fPattern, start);
>+			if (i == -1 || i > max)
>+				return -1;
>+			return i;
>+		}
>+
>+		for (int i= start; i <= max; ++i) {
>+			if (text.regionMatches(true, i, fPattern, 0, fLength))
>+				return i;
>+		}
>+
>+		return -1;
>+	}
>+	/**
>+	 * @param text a simple regular expression that may only contain '?'(s)
>+	 * @param start the starting index in the text for search, inclusive
>+	 * @param end the stopping point of search, exclusive
>+	 * @param p a simple regular expression that may contains '?'
>+	 * @return the starting index in the text of the pattern , or -1 if not found
>+	 */
>+	protected int regExpPosIn(String text, int start, int end, String p) {
>+		int plen= p.length();
>+
>+		int max= end - plen;
>+		for (int i= start; i <= max; ++i) {
>+			if (regExpRegionMatches(text, i, p, 0, plen))
>+				return i;
>+		}
>+		return -1;
>+	}
>+
>+
>+	protected boolean regExpRegionMatches(String text, int tStart, String p, int pStart, int plen) {
>+		while (plen-- > 0) {
>+			char tchar= text.charAt(tStart++);
>+			char pchar= p.charAt(pStart++);
>+
>+			/* process wild cards */
>+			if (!fIgnoreWildCards) {
>+				/* skip single wild cards */
>+				if (pchar == fSingleWildCard) {
>+					continue;
>+				}
>+			}
>+			if (pchar == tchar)
>+				continue;
>+			if (fIgnoreCase) {
>+				if (Character.toUpperCase(tchar) == Character.toUpperCase(pchar))
>+					continue;
>+				// comparing after converting to upper case doesn't handle all cases;
>+				// also compare after converting to lower case
>+				if (Character.toLowerCase(tchar) == Character.toLowerCase(pchar))
>+					continue;
>+			}
>+			return false;
>+		}
>+		return true;
>+	}
>+	/**
>+	 * @param text the string to match
>+	 * @param start the starting index in the text for search, inclusive
>+	 * @param end the stopping point of search, exclusive
>+	 * @param p a string that has no wildcard
>+	 * @return the starting index in the text of the pattern , or -1 if not found
>+	 */
>+	protected int textPosIn(String text, int start, int end, String p) {
>+
>+		int plen= p.length();
>+		int max= end - plen;
>+
>+		if (!fIgnoreCase) {
>+			int i= text.indexOf(p, start);
>+			if (i == -1 || i > max)
>+				return -1;
>+			return i;
>+		}
>+
>+		for (int i= start; i <= max; ++i) {
>+			if (text.regionMatches(true, i, p, 0, plen))
>+				return i;
>+		}
>+
>+		return -1;
>+	}
>+}
>Index: src/org/eclipse/wst/sse/ui/internal/handlers/CustomFilterHandler.java
>===================================================================
>RCS file: src/org/eclipse/wst/sse/ui/internal/handlers/CustomFilterHandler.java
>diff -N src/org/eclipse/wst/sse/ui/internal/handlers/CustomFilterHandler.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/wst/sse/ui/internal/handlers/CustomFilterHandler.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,35 @@
>+/*******************************************************************************
>+ * Copyright (c) 2010 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:
>+ * IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.wst.sse.ui.internal.handlers;
>+
>+import org.eclipse.core.commands.AbstractHandler;
>+import org.eclipse.core.commands.ExecutionEvent;
>+import org.eclipse.core.commands.ExecutionException;
>+import org.eclipse.ui.IEditorPart;
>+import org.eclipse.ui.handlers.HandlerUtil;
>+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
>+import org.eclipse.wst.sse.ui.internal.contentoutline.ConfigurableContentOutlinePage;
>+import org.eclipse.wst.sse.ui.internal.filter.CustomFilterProcessor;
>+
>+public class CustomFilterHandler extends AbstractHandler {
>+	public Object execute(ExecutionEvent event) throws ExecutionException {
>+
>+		IEditorPart editor = HandlerUtil.getActiveEditor(event);
>+		
>+		ConfigurableContentOutlinePage page = (ConfigurableContentOutlinePage) editor.getAdapter(IContentOutlinePage.class);
>+		if (page != null) {
>+			CustomFilterProcessor filterProcessor = new CustomFilterProcessor(page.getConfiguration().getPreferenceStore(), page.getConfiguration().getOutlineFilterTarget(), page.getTreeViewer());
>+			 
>+			 filterProcessor.openDialog();
>+		}
>+		return null;
>+	}
>+}
>Index: src/org/eclipse/wst/sse/ui/views/contentoutline/ContentOutlineConfiguration.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/views/contentoutline/ContentOutlineConfiguration.java,v
>retrieving revision 1.17
>diff -u -r1.17 ContentOutlineConfiguration.java
>--- src/org/eclipse/wst/sse/ui/views/contentoutline/ContentOutlineConfiguration.java	22 Oct 2010 18:37:41 -0000	1.17
>+++ src/org/eclipse/wst/sse/ui/views/contentoutline/ContentOutlineConfiguration.java	10 Nov 2010 17:17:25 -0000
>@@ -86,6 +86,8 @@
> 	private IContributionItem[] fMenuContributions = null;
> 	private IContributionItem[] fToolbarContributions = null;
> 	private final String OUTLINE_LINK_PREF = "outline-link-editor"; //$NON-NLS-1$
>+ private final String OUTLINE_FILTER_PREF = "org.eclipse.wst.sse.ui.OutlinePage"; //$NON-NLS-1$
>+	private String fOutlineFilterPref = OUTLINE_FILTER_PREF; //$NON-NLS-1$
> 	ImageDescriptor SYNCED_D = EditorPluginImageHelper.getInstance().getImageDescriptor(EditorPluginImages.IMG_DLCL_SYNCED);
> 	ImageDescriptor SYNCED_E = EditorPluginImageHelper.getInstance().getImageDescriptor(EditorPluginImages.IMG_ELCL_SYNCED);
> 
>@@ -195,7 +197,7 @@
> 	 * @return the preference store in which to remember preferences (such as
> 	 * the link-with-editor toggle state)
> 	 */
>-	protected IPreferenceStore getPreferenceStore() {
>+	public IPreferenceStore getPreferenceStore() {
> 		return SSEUIPlugin.getInstance().getPreferenceStore();
> 	}
> 
>@@ -313,4 +315,8 @@
> 			fMenuContributions = null;
> 		}
> 	}
>+	
>+	public String getOutlineFilterTarget(){
>+		return fOutlineFilterPref ;
>+	}
> }
>#P org.eclipse.wst.xml.ui
>Index: plugin.properties
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.xml.ui/plugin.properties,v
>retrieving revision 1.49
>diff -u -r1.49 plugin.properties
>--- plugin.properties	15 Oct 2010 19:09:07 -0000	1.49
>+++ plugin.properties	10 Nov 2010 17:17:50 -0000
>@@ -154,3 +154,11 @@
> 
> # XML Documentation view
> xmlannotations=Documentation
>+
>+# outline filter
>+HideComments.label=Comments
>+HideComments.description=Hides Comments
>+HideProcessingInstruction.label=Processing Instructions
>+HideProcessingInstruction.description=Hides Processing Instructions
>+HideCDATASection.label=CDATA
>+HideCDATASection.description=Hides CDATA Section Tags
>\ No newline at end of file
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.xml.ui/plugin.xml,v
>retrieving revision 1.124
>diff -u -r1.124 plugin.xml
>--- plugin.xml	3 Nov 2010 14:26:54 -0000	1.124
>+++ plugin.xml	10 Nov 2010 17:17:56 -0000
>@@ -1782,4 +1782,31 @@
> 			</state>
> 		</command>
> 	</extension> 
>+		 <extension
>+ point="org.eclipse.wst.sse.ui.outlineElementFilter">
>+ <filter
>+ targetId="org.eclipse.wst.xml.ui.OutlinePage"
>+ name="%HideComments.label"
>+ enabled="false"
>+ description="%HideComments.description"
>+ class="org.eclipse.wst.xml.ui.views.contentoutline.XMLCommentFilter"
>+ id="org.eclipse.wst.xml.ui.views.contentoutline.XMLCommentFilter">
>+ </filter>
>+ <filter
>+ targetId="org.eclipse.wst.xml.ui.OutlinePage"
>+ name="%HideProcessingInstruction.label"
>+ enabled="false"
>+ description="%HideProcessingInstruction.description"
>+ class="org.eclipse.wst.xml.ui.views.contentoutline.XMLProcessingInstructionFilter"
>+ id="org.eclipse.wst.xml.ui.views.contentoutline.XMLProcessingInstructionFilter">
>+ </filter>
>+ <filter
>+ targetId="org.eclipse.wst.xml.ui.OutlinePage"
>+ name="%HideCDATASection.label"
>+ enabled="false"
>+ description="%HideCDATASection.description"
>+ class="org.eclipse.wst.xml.ui.views.contentoutline.XMLCDATASectionFilter"
>+ id="org.eclipse.wst.xml.ui.views.contentoutline.XMLCDATASectionFilter">
>+ </filter>
>+</extension>
> </plugin>
>Index: src/org/eclipse/wst/xml/ui/views/contentoutline/AbstractXMLContentOutlineConfiguration.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/views/contentoutline/AbstractXMLContentOutlineConfiguration.java,v
>retrieving revision 1.4
>diff -u -r1.4 AbstractXMLContentOutlineConfiguration.java
>--- src/org/eclipse/wst/xml/ui/views/contentoutline/AbstractXMLContentOutlineConfiguration.java	26 Feb 2009 05:09:50 -0000	1.4
>+++ src/org/eclipse/wst/xml/ui/views/contentoutline/AbstractXMLContentOutlineConfiguration.java	10 Nov 2010 17:17:57 -0000
>@@ -196,7 +196,7 @@
> 	 * 
> 	 * @see org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration#getPreferenceStore()
> 	 */
>-	protected IPreferenceStore getPreferenceStore() {
>+	public IPreferenceStore getPreferenceStore() {
> 		return XMLUIPlugin.getDefault().getPreferenceStore();
> 	}
> 
>Index: src/org/eclipse/wst/xml/ui/views/contentoutline/XMLCDATASectionFilter.java
>===================================================================
>RCS file: src/org/eclipse/wst/xml/ui/views/contentoutline/XMLCDATASectionFilter.java
>diff -N src/org/eclipse/wst/xml/ui/views/contentoutline/XMLCDATASectionFilter.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/wst/xml/ui/views/contentoutline/XMLCDATASectionFilter.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,27 @@
>+/*******************************************************************************
>+ * Copyright (c) 2010 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:
>+ * IBM Corporation - initial API and implementation
>+ * 
>+ *******************************************************************************/
>+package org.eclipse.wst.xml.ui.views.contentoutline;
>+
>+import org.eclipse.jface.viewers.Viewer;
>+import org.eclipse.jface.viewers.ViewerFilter;
>+import org.eclipse.wst.xml.core.internal.document.CDATASectionImpl;
>+
>+public class XMLCDATASectionFilter extends ViewerFilter {
>+
>+	public boolean select(Viewer viewer, Object parent, Object element) {
>+		if (element instanceof CDATASectionImpl){
>+			return false;
>+		}
>+		return true;
>+	}
>+
>+}
>\ No newline at end of file
>Index: src/org/eclipse/wst/xml/ui/views/contentoutline/XMLCommentFilter.java
>===================================================================
>RCS file: src/org/eclipse/wst/xml/ui/views/contentoutline/XMLCommentFilter.java
>diff -N src/org/eclipse/wst/xml/ui/views/contentoutline/XMLCommentFilter.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/wst/xml/ui/views/contentoutline/XMLCommentFilter.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,33 @@
>+/*******************************************************************************
>+ * Copyright (c) 2010 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:
>+ * IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.wst.xml.ui.views.contentoutline;
>+
>+
>+import org.eclipse.jface.viewers.Viewer;
>+import org.eclipse.jface.viewers.ViewerFilter;
>+import org.eclipse.wst.xml.core.internal.document.CommentImpl;
>+
>+
>+/**
>+ * Filters package declarations
>+ */
>+public class XMLCommentFilter extends ViewerFilter {
>+
>+	/*
>+	 * @see ViewerFilter
>+	 */
>+	public boolean select(Viewer viewer, Object parent, Object element) {
>+		if (element instanceof CommentImpl){
>+			return false;
>+		}
>+		return true;
>+	}
>+}
>Index: src/org/eclipse/wst/xml/ui/views/contentoutline/XMLContentOutlineConfiguration.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/views/contentoutline/XMLContentOutlineConfiguration.java,v
>retrieving revision 1.30
>diff -u -r1.30 XMLContentOutlineConfiguration.java
>--- src/org/eclipse/wst/xml/ui/views/contentoutline/XMLContentOutlineConfiguration.java	13 Oct 2008 23:42:32 -0000	1.30
>+++ src/org/eclipse/wst/xml/ui/views/contentoutline/XMLContentOutlineConfiguration.java	10 Nov 2010 17:18:24 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2001, 2008 IBM Corporation and others.
>+ * Copyright (c) 2001, 2010 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
>@@ -266,7 +266,8 @@
> 	 * Preference key for Show Attributes
> 	 */
> 	private final String OUTLINE_SHOW_ATTRIBUTE_PREF = "outline-show-attribute"; //$NON-NLS-1$
>-
>+	private final String OUTLINE_FILTER_PREF = "org.eclipse.wst.xml.ui.OutlinePage"; //$NON-NLS-1$
>+	 
> 	/**
> 	 * Create new instance of XMLContentOutlineConfiguration
> 	 */
>@@ -408,4 +409,8 @@
> 		}
> 		return filteredSelection;
> 	}
>+	
>+	public String getOutlineFilterTarget(){
>+		return OUTLINE_FILTER_PREF ;
>+	}
> }
>Index: src/org/eclipse/wst/xml/ui/views/contentoutline/XMLProcessingInstructionFilter.java
>===================================================================
>RCS file: src/org/eclipse/wst/xml/ui/views/contentoutline/XMLProcessingInstructionFilter.java
>diff -N src/org/eclipse/wst/xml/ui/views/contentoutline/XMLProcessingInstructionFilter.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/wst/xml/ui/views/contentoutline/XMLProcessingInstructionFilter.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,26 @@
>+/*******************************************************************************
>+ * Copyright (c) 2010 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:
>+ * IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.wst.xml.ui.views.contentoutline;
>+
>+import org.eclipse.jface.viewers.Viewer;
>+import org.eclipse.jface.viewers.ViewerFilter;
>+import org.eclipse.wst.xml.core.internal.document.ProcessingInstructionImpl;
>+
>+public class XMLProcessingInstructionFilter extends ViewerFilter {
>+
>+	public boolean select(Viewer viewer, Object parent, Object element) {
>+		if (element instanceof ProcessingInstructionImpl){
>+			return false;
>+		}
>+		return true;
>+	}
>+
>+}
>\ No newline at end of file

Actions: View | Diff

Attachments on bug 109045: 158575 | 158676 | 159755 | 172315 | 182837 | 183247 | 183248