Attachment #209727 for bug #360894

Lines 54-59 Link Here

(-)a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java (+6 lines)
54		54
55	public static String DependencyPropertiesDialog_exportGroupText;	55	public static String DependencyPropertiesDialog_exportGroupText;
56		56
		57	public static String ExtensionsPage_toggleExpandState;
		58
		59	public static String ExtensionsPage_searchWithExtensionsFilter;
		60
57	public static String ExternalizeStringsOperation_editNames_addComment;	61	public static String ExternalizeStringsOperation_editNames_addComment;
58		62
59	public static String ExternalizeStringsOperation_editNames_insertProperty;	63	public static String ExternalizeStringsOperation_editNames_insertProperty;
Lines 1425-1430 Link Here
1425	public static String EditorActions_revert;	1429	public static String EditorActions_revert;
1426	public static String Actions_open_label;	1430	public static String Actions_open_label;
1427	public static String Actions_delete_label;	1431	public static String Actions_delete_label;
		1432	public static String Actions_filter_relatedPluginElements;
		1433	public static String Actions_search_relatedPluginElements;
1428	public static String Actions_synchronizeVersions_label;	1434	public static String Actions_synchronizeVersions_label;
1429		1435
1430	public static String Menus_new_label;	1436	public static String Menus_new_label;




/*******************************************************************************
 *  Copyright (c) 2011, 2012 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:
 *     Sascha Becher <s.becher@qualitype.de> - bug 360894
 *******************************************************************************/
package org.eclipse.pde.internal.ui.editor.actions;

import java.util.*;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.pde.core.plugin.IPluginAttribute;
import org.eclipse.pde.core.plugin.IPluginElement;
import org.eclipse.pde.internal.ui.PDEPluginImages;
import org.eclipse.pde.internal.ui.PDEUIMessages;
import org.eclipse.pde.internal.ui.editor.plugin.FormFilteredTree;
import org.eclipse.pde.internal.ui.search.ExtensionsPatternFilter;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.actions.ActionFactory;
import org.eclipse.ui.keys.IBindingService;

/**
 * Serves as Filter Related Action in context menu of the extensions tree and toolbar icon on the same page 
 * 
 * @author Sascha Becher
 */
public class FilterRelatedExtensionsAction extends Action {

	protected TreeViewer fExtensionTree;
	protected FormFilteredTree fFilteredTree;

	public FilterRelatedExtensionsAction(TreeViewer treeViewer, FormFilteredTree filteredTree) {
		String filterBinding = ((IBindingService) PlatformUI.getWorkbench().getAdapter(IBindingService.class)).getBestActiveBindingFormattedFor(ActionFactory.FIND.getCommandId());
		setImageDescriptor(PDEPluginImages.DESC_FILTER_RELATED);
		setDisabledImageDescriptor(PDEPluginImages.DESC_FILTER_RELATED_DISABLED);
		setText(PDEUIMessages.Actions_filter_relatedPluginElements + ((filterBinding != null) ? "\t" + filterBinding : "")); //$NON-NLS-1$ //$NON-NLS-2$

		this.fExtensionTree = treeViewer;
		this.fFilteredTree = filteredTree;
	}

	public void run() {
		String filterPattern = getFilterRelatedPattern((IStructuredSelection) fExtensionTree.getSelection());
		Text filterControl = fFilteredTree.getFilterControl();
		if (filterControl != null && filterPattern.length() > 0) {
			filterControl.setText(filterPattern);
		}
	}

	/**
	 * Obtains common attributes from selected plugin element to filter tree for; 
	 * attribute values are concatenated with a slash and set as filter text
	 * 
	 * @param selection selected items to filter for related plugin elements 
	 */
	public static String getFilterRelatedPattern(IStructuredSelection selection) {
		Iterator it = selection.iterator();
		Set filterPatterns = new HashSet();
		while (it.hasNext()) {
			Object treeElement = it.next();
			if (treeElement instanceof IPluginElement) {
				IPluginElement pluginElement = (IPluginElement) treeElement;
				for (int i = 0; i < ExtensionsPatternFilter.RELATED_ATTRIBUTES.length; i++) {
					String property = ExtensionsPatternFilter.RELATED_ATTRIBUTES[i];
					IPluginAttribute attribute = pluginElement.getAttribute(property);
					if (attribute != null && attribute.getValue() != null && attribute.getValue().length() > 0) {
						String value = attribute.getValue();
						if (!value.startsWith("%")) { //$NON-NLS-1$
							int delimiterPosition = value.indexOf('?'); // split before '?' and right after last '='
							if (delimiterPosition == -1) {
								filterPatterns.add(value);
							} else {
								filterPatterns.add(value.substring(0, delimiterPosition));
								int position = value.lastIndexOf('=');
								if (position != -1) {
									filterPatterns.add(value.substring(position + 1, value.length()));
								}
							}
						} else {
							String resourceValue = pluginElement.getResourceString(value);
							if ((resourceValue != null && resourceValue.length() > 0)) {
								filterPatterns.add(resourceValue);
							}
						}
					}
				}
			}
		}
		StringBuffer patternBuffer = new StringBuffer();
		for (Iterator iterator = filterPatterns.iterator(); iterator.hasNext();) {
			Object pattern = iterator.next();
			if (pattern != null) {
				patternBuffer.append(pattern);
				patternBuffer.append('/');
			}
		}
		String filterPattern = patternBuffer.toString();
		if (filterPattern.endsWith("/")) { //$NON-NLS-1$
			filterPattern = filterPattern.substring(0, filterPattern.length() - 1);
		}
		return filterPattern;
	}

	public static boolean isFilterRelatedEnabled(IStructuredSelection structuredSelection) {
		boolean createFilterRelatedAction = false;
		if (structuredSelection != null && !structuredSelection.isEmpty()) {
			Iterator it = structuredSelection.iterator();
			while (it.hasNext()) {
				Object treeElement = it.next();
				if (treeElement instanceof IPluginElement) {
					createFilterRelatedAction |= isFilterRelatedEnabled((IPluginElement) treeElement);
				}
			}
		}
		return createFilterRelatedAction;
	}

	private static boolean isFilterRelatedEnabled(IPluginElement pluginElement) {
		for (int i = 0; i < ExtensionsPatternFilter.RELATED_ATTRIBUTES.length; i++) {
			String property = ExtensionsPatternFilter.RELATED_ATTRIBUTES[i];
			IPluginAttribute attribute = pluginElement.getAttribute(property);
			if (attribute != null) {
				return true;
			}
		}
		return false;
	}

}




/*******************************************************************************
 *  Copyright (c) 2011, 2012 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:
 *     Sascha Becher <s.becher@qualitype.de> - bug 360894
 *******************************************************************************/
package org.eclipse.pde.internal.ui.editor.actions;

import org.eclipse.jface.action.Action;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.pde.internal.core.search.PluginSearchInput;
import org.eclipse.pde.internal.core.search.PluginSearchScope;
import org.eclipse.pde.internal.ui.PDEPluginImages;
import org.eclipse.pde.internal.ui.editor.plugin.FormFilteredTree;
import org.eclipse.pde.internal.ui.search.FindExtensionsByAttributeQuery;
import org.eclipse.search.ui.ISearchQuery;
import org.eclipse.search.ui.NewSearchUI;

/**
 * Search in workspace plugins for occurences of either the current filter text or filter related attributes
 * using the ExtensionsPatternFilter search behaviour.
 * 
 * @author Sascha Becher
 */
public class SearchExtensionsAction extends Action {

	protected IStructuredSelection selection;
	protected FormFilteredTree fFilteredTree;

	private String fFilterRelatedText;

	public SearchExtensionsAction(FormFilteredTree filteredTree, String actionText) {
		this(null, null, actionText);
		this.fFilteredTree = filteredTree;
	}

	public SearchExtensionsAction(IStructuredSelection selection, String filterRelatedText, String actionText) {
		setImageDescriptor(PDEPluginImages.DESC_SEARCH_EXTENSIONS);
		setDisabledImageDescriptor(PDEPluginImages.DESC_SEARCH_EXTENSIONS_DISABLED);
		setText(actionText);
		this.selection = selection;
		this.fFilterRelatedText = filterRelatedText;
	}

	public void run() {
		NewSearchUI.activateSearchResultView();
		NewSearchUI.runQueryInBackground(createSearchQuery());
	}

	protected ISearchQuery createSearchQuery() {
		PluginSearchInput input = new PluginSearchInput();
		input.setSearchElement(PluginSearchInput.ELEMENT_PLUGIN);
		input.setSearchLimit(PluginSearchInput.LIMIT_ALL);
		input.setSearchString(getFilterText());
		input.setSearchScope(new PluginSearchScope(PluginSearchScope.SCOPE_WORKSPACE, PluginSearchScope.EXTERNAL_SCOPE_ALL, null));
		input.setCaseSensitive(false);
		return new FindExtensionsByAttributeQuery(selection, input);
	}

	private String getFilterText() {
		if (fFilterRelatedText != null) {
			return fFilterRelatedText;
		}
		if (fFilteredTree != null) {
			return fFilteredTree.getFilterControl().getText();
		}
		return new String();
	}

}




/*******************************************************************************
 *  Copyright (c) 2011, 2012 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:
 *     Sascha Becher <s.becher@qualitype.de> - bug 360894
 *******************************************************************************/
package org.eclipse.pde.internal.ui.editor.actions;

import java.util.*;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.viewers.*;
import org.eclipse.pde.internal.core.text.plugin.PluginParentNode;
import org.eclipse.pde.internal.ui.PDEPluginImages;
import org.eclipse.pde.internal.ui.PDEUIMessages;
import org.eclipse.pde.internal.ui.editor.plugin.FormFilteredTree;

/**
 * Expands and collapses selected tree nodes in the extension elements tree viewer upon their expand state.
 *  
 * @author Sascha Becher
 */
public class ToggleExpandStateAction extends Action {

	public static int NEEDS_EXPAND = 1;
	public static int NEEDS_COLLAPSE = 2;

	protected TreeViewer fExtensionTree;
	protected FormFilteredTree fFilteredTree;

	/**
	 * @param treeViewer
	 */
	public ToggleExpandStateAction(FormFilteredTree filteredTree, TreeViewer treeViewer) {
		setImageDescriptor(PDEPluginImages.DESC_TOGGLE_EXPAND_STATE);
		setDisabledImageDescriptor(PDEPluginImages.DESC_TOGGLE_EXPAND_STATE_DISABLED);
		setText(PDEUIMessages.ExtensionsPage_toggleExpandState);
		fExtensionTree = treeViewer;
		fFilteredTree = filteredTree;
	}

	public void run() {
		StructuredSelection selection = (StructuredSelection) fExtensionTree.getSelection();
		if (!selection.isEmpty()) {
			try {
				List children = traverseChildren(selection.toList());
				fFilteredTree.setRedraw(false);
				int state = getStateChangeRequired(selection);
				if (state == NEEDS_EXPAND) { // expand sub tree
					for (Iterator iterator = children.iterator(); iterator.hasNext();) {
						fExtensionTree.expandToLevel(iterator.next(), 0);
					}
					if (selection != null && !(selection.isEmpty())) {
						fExtensionTree.setSelection(selection, false);
					}
				} else { // collapse sub tree
					for (Iterator iterator = selection.iterator(); iterator.hasNext();) {
						fExtensionTree.setExpandedState(iterator.next(), false);
					}
				}
			} finally {
				fFilteredTree.setRedraw(true);
				fExtensionTree.refresh();
			}
		}
		super.run();
	}

	public int getStateChangeRequired(StructuredSelection selection) {
		for (Iterator iterator = selection.iterator(); iterator.hasNext();) {
			Object node = iterator.next();
			if (!fExtensionTree.getExpandedState(node)) {
				return NEEDS_EXPAND;
			}
		}
		return NEEDS_COLLAPSE;
	}

	protected List traverseChildren(List children) {
		List foundChildren = new ArrayList();
		foundChildren.addAll(0, children);
		for (Iterator iterator = children.iterator(); iterator.hasNext();) {
			Object child = iterator.next();
			if (child instanceof PluginParentNode) {
				PluginParentNode node = (PluginParentNode) child;
				if (node.getChildCount() > 0) {
					List asList = Arrays.asList(node.getChildren());
					List grandChildren = traverseChildren(asList);
					foundChildren.addAll(0, grandChildren);
				}
			}
		}
		return foundChildren;
	}

	public static boolean isExpandable(IStructuredSelection selection) {
		boolean isExpandable = false;
		if (selection != null) {
			if (!selection.isEmpty()) {
				// enable expand action when selected leafs are expandable  
				for (Iterator iterator = selection.iterator(); iterator.hasNext();) {
					Object element = iterator.next();
					if (element instanceof PluginParentNode) {
						PluginParentNode node = (PluginParentNode) element;
						if (node.getChildCount() > 0) {
							isExpandable = true;
							break;
						}
					}
				}
			}
		}
		return isExpandable;
	}

}




/*******************************************************************************
 * Copyright (c) 2000, 2012 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

 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Peter Friese <peter.friese@gentleware.com> - bug 194529, bug 196867
 *     Sascha Becher <s.becher@qualitype.com> - bug 360894
 *******************************************************************************/
package org.eclipse.pde.internal.ui.editor.plugin;

import java.util.*;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.*;
import org.eclipse.core.runtime.jobs.*;
import org.eclipse.jface.action.*;
import org.eclipse.jface.dialogs.IMessageProvider;
import org.eclipse.jface.util.IPropertyChangeListener;

import org.eclipse.pde.internal.core.text.plugin.PluginBaseNode;
import org.eclipse.pde.internal.ui.*;
import org.eclipse.pde.internal.ui.editor.*;
import org.eclipse.pde.internal.ui.editor.actions.*;
import org.eclipse.pde.internal.ui.editor.actions.SortAction;
import org.eclipse.pde.internal.ui.editor.contentassist.XMLElementProposalComputer;
import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
import org.eclipse.pde.internal.ui.parts.TreePart;
import org.eclipse.pde.internal.ui.search.ExtensionsPatternFilter;
import org.eclipse.pde.internal.ui.search.PluginSearchActionGroup;
import org.eclipse.pde.internal.ui.util.SWTUtil;
import org.eclipse.pde.internal.ui.wizards.extension.ExtensionEditorWizard;

import org.eclipse.swt.widgets.*;
import org.eclipse.ui.actions.ActionContext;
import org.eclipse.ui.actions.ActionFactory;
import org.eclipse.ui.dialogs.PatternFilter;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.Section;
import org.eclipse.ui.progress.WorkbenchJob;

public class ExtensionsSection extends TreeSection implements IModelChangedListener, IPropertyChangeListener {
	private static final int BUTTON_MOVE_DOWN = 4;

	private Hashtable fEditorWizards;
	private SortAction fSortAction;
	private CollapseAction fCollapseAction;
	private ToggleExpandStateAction fExpandAction;
	private FilterRelatedExtensionsAction fFilterRelatedAction;
	private SearchExtensionsAction fSearchAction;

	private static final int BUTTON_ADD = 0;

	// TODO common label properties should be configured in preferences
	public static final String[] COMMON_LABEL_ATTRIBUTES = {"label", //$NON-NLS-1$
			"name", "class", "id", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
			"commandId", "property", "activityId", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
			"attribute", "value"}; //$NON-NLS-1$ //$NON-NLS-2$

	private static final String[] VALID_IMAGE_TYPES = {"png", "bmp", "ico", "gif", "jpg", "tiff"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$


					updateButtons(ssel.size() != 1 ? null : ssel);
				}
			});

			// required for enabling constant typing in the filter control
			filterText.addKeyListener(new KeyAdapter() {
				public void keyPressed(KeyEvent e) {
					if (fFilteredTree.getFilterControl().getText().length() > 0) {
						Job jobs[] = Job.getJobManager().find(null);
						try {
							Job.getJobManager().suspend();
							for (int i = 0; i < jobs.length; i++) {
								Job job = jobs[i];
								if (job != null && "Refresh Filter".equals(job.getName())) { //$NON-NLS-1$
									// remove prior filtering refresh jobs in order to avoid blocked filter control
									job.cancel();
								}
							}
						} finally {
							Job.getJobManager().resume();
						}
					}
				}
			});
		}
	}


				}
			}
		});
		// Add action to filter tree with some of the selection's attributes
		fFilterRelatedAction = new FilterRelatedExtensionsAction(fExtensionTree, fFilteredTree);
		toolBarManager.add(fFilterRelatedAction);
		// Add action to search all workspace plugins with current filtering applied to the tree viewer
		fSearchAction = new SearchExtensionsAction(fFilteredTree, PDEUIMessages.ExtensionsPage_searchWithExtensionsFilter);
		toolBarManager.add(fSearchAction);
		// Add separator
		Separator separator = new Separator();
		toolBarManager.add(separator);
		// Add sort action to the tool bar
		fSortAction = new SortAction(fExtensionTree, PDEUIMessages.ExtensionsPage_sortAlpha, null, null, this);
		toolBarManager.add(fSortAction);
		// Add expand selected leafs action to the toolbar
		fExpandAction = new ToggleExpandStateAction(fFilteredTree, fExtensionTree);
		toolBarManager.add(fExpandAction);
		// Add collapse action to the tool bar
		fCollapseAction = new CollapseAction(fExtensionTree, PDEUIMessages.ExtensionsPage_collapseAll);
		toolBarManager.add(fCollapseAction);

	 * @see org.eclipse.pde.internal.ui.editor.PDESection#doGlobalAction(java.lang.String)
	 */
	public boolean doGlobalAction(String actionId) {
		if (actionId.equals(ActionFactory.FIND.getId()) && fFilterRelatedAction != null) {
			fFilterRelatedAction.run();
			return true;
		}
		if (!isEditable()) {
			return false;
		}

		if (actionId.equals(ActionFactory.DELETE.getId())) {
			handleDelete();
			return true;


	protected void fillContextMenu(IMenuManager manager) {
		ISelection selection = fExtensionTree.getSelection();
		final IStructuredSelection ssel = (IStructuredSelection) selection;
		if (ssel.size() == 1) {
			Object object = ssel.getFirstElement();
			if (object instanceof IPluginParent) {

			manager.add(new Separator());
			delAction.setEnabled(isEditable());
		}
		if (ssel.size() > 0) {
			if (FilterRelatedExtensionsAction.isFilterRelatedEnabled(ssel)) {
				FilterRelatedExtensionsAction filterRelatedAction = new FilterRelatedExtensionsAction(fExtensionTree, fFilteredTree);
				manager.add(filterRelatedAction);
				SearchExtensionsAction searchRelatedAction = new SearchExtensionsAction(ssel, FilterRelatedExtensionsAction.getFilterRelatedPattern(ssel), PDEUIMessages.Actions_search_relatedPluginElements);
				manager.add(searchRelatedAction);
				manager.add(new Separator());
			}
		}
		manager.add(new Separator());
		if (ssel.size() < 2) { // only cut things when the selection is one
			getPage().getPDEEditor().getContributor().addClipboardActions(manager);
		}
		getPage().getPDEEditor().getContributor().contextMenuAboutToShow(manager, false);
		this.fFilteredTree.update();
	}

	static IMenuManager fillContextMenu(PDEFormPage page, final IPluginParent parent, IMenuManager manager) {

				PDEPlugin.logException(e);
			}
		}
	}

	public FormFilteredTree getFormFilteredTree() {
		return fFilteredTree;
	}

	private void handleNew() {

		// The model changed but the editor is still open, we should try to retain expansion, selection will be retained on its own
		Object[] expanded = fExtensionTree.getExpandedElements();
		IPluginModelBase model = (IPluginModelBase) getPage().getModel();
		try {
			fExtensionTree.getControl().setRedraw(false);
			fExtensionTree.setInput(model.getPluginBase());
			fExtensionTree.setExpandedElements(expanded);
		} finally {
			fExtensionTree.getControl().setRedraw(true);
		}
		reportMissingExtensionPointSchemas(model.getPluginBase());
		getManagedForm().fireSelectionChanged(ExtensionsSection.this, fExtensionTree.getSelection());
		super.refresh();

			if (labelAtt == null) {
				// try some hard-coded attributes that
				// are used frequently
				for (int i = 0; i < COMMON_LABEL_ATTRIBUTES.length; i++) {
					labelAtt = element.getAttribute(COMMON_LABEL_ATTRIBUTES[i]);
					if (labelAtt != null)
						break;
				}

						labelAtt = element.getAttributes()[0];
				}
			}
			if (labelAtt != null && labelAtt.getValue() != null) {
				fullName = stripShortcuts(labelAtt.getValue());
				if (labelAtt.getName().equals(COMMON_LABEL_ATTRIBUTES[2])) { // remove package from handler class 
					fullName = fullName.substring(fullName.lastIndexOf('.') + 1, fullName.length());
				}
			}
			fullName = element.getResourceString(fullName);

			if (fullNames)
				return fullName != null ? fullName : baseName;
			if (fullName == null)

	}

	private void updateButtons(Object item) {
		if (fExpandAction != null) {
			fExpandAction.setEnabled(ToggleExpandStateAction.isExpandable((IStructuredSelection) fExtensionTree.getSelection()));
		}
		if (fFilterRelatedAction != null) {
			fFilterRelatedAction.setEnabled(FilterRelatedExtensionsAction.isFilterRelatedEnabled((IStructuredSelection) fExtensionTree.getSelection()));
		}
		if (fSearchAction != null) {
			Text filterControl = fFilteredTree.getFilterControl();
			// enable action only when filtering occurs
			fSearchAction.setEnabled(filterControl != null && filterControl.getText().length() > 0);
		}

		if (getPage().getModel().isEditable() == false)
			return;
		boolean sorted = fSortAction != null && fSortAction.isChecked();

	 * @see org.eclipse.pde.internal.ui.editor.TreeSection#createTreeViewer(org.eclipse.swt.widgets.Composite, int)
	 */
	protected TreeViewer createTreeViewer(Composite parent, int style) {
		fFilteredTree = new FormFilteredTree(parent, style, new ExtensionsPatternFilter()) {
			protected WorkbenchJob doCreateRefreshJob() {
				final WorkbenchJob job = super.doCreateRefreshJob();
				job.addJobChangeListener(new JobChangeAdapter() {
					private ISelection selection;

					public void scheduled(IJobChangeEvent event) {
						((ExtensionsPatternFilter) fFilteredTree.getPatternFilter()).clearMatchingLeafs();
						selection = fExtensionTree.getSelection();
						fFilteredTree.setRedraw(false);
					}

					public void done(IJobChangeEvent event) {
						ExtensionsPatternFilter extensionsPatternFilter = ((ExtensionsPatternFilter) fFilteredTree.getPatternFilter());
						fExtensionTree.collapseAll();
						Object[] leafs = extensionsPatternFilter.getMatchingLeafsAsArray();
						for (int i = 0; i < leafs.length; i++) {
							fExtensionTree.expandToLevel(leafs[i], 0);
						}
						if (selection != null && !(selection.isEmpty())) {
							fExtensionTree.setSelection(selection, false);
						}
						fFilteredTree.setRedraw(true);
					}

				});
				return job;
			}

			protected long getRefreshJobDelay() {
				return 500; // required for continuous typing while performing extensive search operation
			}
		};
		parent.setData("filtered", Boolean.TRUE); //$NON-NLS-1$
		fFilteredTree.addMouseWheelListener(new MouseWheelListener() {

			public void mouseScrolled(MouseEvent e) {
				if ((e.stateMask & SWT.MOD1) == SWT.MOD1) {
					//System.out.println("e.stateMask == SWT.MOD1");
					//fExtensionTree.scrollDown(0, 80);
					//fFilteredTree.redraw();
				}
				//}

			}
		});
		return fFilteredTree.getViewer();
	}


Lines 1189-1194 Link Here

(-)a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties (+4 lines)
1189	EditorActions_revert = Re&vert	1189	EditorActions_revert = Re&vert
1190	Actions_open_label = &Open	1190	Actions_open_label = &Open
1191	Actions_delete_label = &Delete	1191	Actions_delete_label = &Delete
		1192	Actions_filter_relatedPluginElements=&Filter Related
		1193	Actions_search_relatedPluginElements=Search &Related
1192	Actions_synchronizeVersions_label = S&ynchronize Versions...	1194	Actions_synchronizeVersions_label = S&ynchronize Versions...
1193		1195
1194	Menus_new_label = &New	1196	Menus_new_label = &New
Lines 1536-1541 Link Here
1536	ExtensionsPage_title=Extensions	1538	ExtensionsPage_title=Extensions
1537	ExtensionsPage_tabName=Extensions	1539	ExtensionsPage_tabName=Extensions
1538	ExtensionsPage_sortAlpha=Sort the Extensions alphabetically	1540	ExtensionsPage_sortAlpha=Sort the Extensions alphabetically
		1541	ExtensionsPage_toggleExpandState=Toggle Expand State
		1542	ExtensionsPage_searchWithExtensionsFilter=Extension Element Search
1539	ExtensionDetails_title=Extension Details	1543	ExtensionDetails_title=Extension Details
1540	ExtensionDetails_desc=Set the properties of the selected extension. Required fields are denoted by "*".	1544	ExtensionDetails_desc=Set the properties of the selected extension. Required fields are denoted by "*".
1541	ExtensionDetails_id=ID	1545	ExtensionDetails_id=ID




/*******************************************************************************
 *  Copyright (c) 2011, 2012 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:
 *     Sascha Becher <s.becher@qualitype.de> - bug 360894
 *******************************************************************************/
package org.eclipse.pde.internal.ui.search;

import org.eclipse.pde.internal.ui.editor.plugin.ManifestEditor;
import org.eclipse.search.ui.text.Match;

/**
 * An extension to {@link Match} in order to present matching plugins which resulted 
 * in a search queried from the extensions page of the {@link ManifestEditor} 
 * 
 * @author Sascha Becher
 */
public class AttributesMatch extends Match {

	/**
	 * A constant expressing that the {@link Match} resulted in a search queried from 
	 * the extensions page of the {@link ManifestEditor} 
	 */
	public static final int UNIT_ATTRIBUTE_SEARCH_PATTERN = 3;

	protected String searchPattern;

	public AttributesMatch(Object element, String searchPattern) {
		super(element, UNIT_LINE, 0, 0);
		this.searchPattern = searchPattern;
	}

	public String getSearchPattern() {
		return searchPattern;
	}

	public int getBaseUnit() {
		return UNIT_ATTRIBUTE_SEARCH_PATTERN;
	}

}




/*******************************************************************************
 *  Copyright (c) 2011, 2012 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:
 *     Sascha Becher <s.becher@qualitype.de> - bug 360894
 *******************************************************************************/
package org.eclipse.pde.internal.ui.search;

import java.util.ArrayList;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.pde.core.plugin.*;
import org.eclipse.pde.internal.core.search.ISearchResultCollector;
import org.eclipse.pde.internal.core.search.PluginSearchInput;

/**
 * Search operation for finding extension elements within a plugin using the {@link ExtensionsPatternFilter}.
 * 
 * @author Sascha Becher
 */
public class ExtensionElementSearchOperation {

	protected PluginSearchInput fInput;
	private ISearchResultCollector fCollector;

	public ExtensionElementSearchOperation(PluginSearchInput input, ISearchResultCollector collector) {
		this.fInput = input;
		this.fCollector = collector;
	}

	public void execute(IProgressMonitor monitor) {
		IPluginModelBase[] entries = fInput.getSearchScope().getMatchingModels();
		monitor.beginTask("", entries.length); //$NON-NLS-1$

		try {
			for (int i = 0; i < entries.length; i++) {
				IPluginModelBase candidate = entries[i];
				visit(candidate);
				monitor.worked(1);
			}
		} finally {
			monitor.done();
		}
	}

	private void visit(IPluginModelBase model) {
		ArrayList matches = findMatch(model);
		for (int i = 0; i < matches.size(); i++) {
			fCollector.accept(matches.get(i));
		}
	}

	private ArrayList findMatch(IPluginModelBase model) {
		ArrayList result = new ArrayList();
		int searchLimit = fInput.getSearchLimit();
		if (fInput.getSearchElement() == PluginSearchInput.ELEMENT_PLUGIN) {
			if (searchLimit != PluginSearchInput.LIMIT_REFERENCES)
				findPluginDeclaration(model, result);
			if (searchLimit != PluginSearchInput.LIMIT_DECLARATIONS)
				findPluginReferences(model, result);
		}
		return result;
	}

	private void findPluginDeclaration(IPluginModelBase model, ArrayList result) {
		IPluginBase pluginBase = model.getPluginBase();
		ExtensionsPatternFilter filter = new ExtensionsPatternFilter();
		filter.setUseCacheForSearch(true);
		filter.clearMatchingLeafs();
		filter.setPattern(fInput.getSearchString());
		filter.filter(null, pluginBase, pluginBase.getExtensions());
		if (pluginBase instanceof IPlugin && filter.getMatchingLeafsAsArray().length > 0) {
			result.add(pluginBase);
		}
	}

	private void findPluginReferences(IPluginModelBase model, ArrayList result) {
		IPluginBase pluginBase = model.getPluginBase();
		IPluginImport[] imports = pluginBase.getImports();
		for (int i = 0; i < imports.length; i++) {
			findPluginDeclaration(imports[i].getPluginModel(), result);
		}
	}

}




/*******************************************************************************
 *  Copyright (c) 2011, 2012 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:
 *     Sascha Becher <s.becher@qualitype.de> - bug 360894
 *******************************************************************************/
package org.eclipse.pde.internal.ui.search;

import java.util.*;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.pde.core.plugin.*;
import org.eclipse.pde.internal.core.bundle.BundlePlugin;
import org.eclipse.ui.dialogs.PatternFilter;

/**
 * An extended filtering capability for the filtered tree of ExtensionsPage. The
 * search criteria is splitted by / first. The resulting values are used to
 * perform a search on all node's values. All elements fitting at least one of
 * the split values will be displayed. This extensions does not compromise the
 * default filtering behaviour of the tree while providing the ability to
 * highlight related items such as commands along with their command images,
 * handlers, menu entries and activities.
 * 
 * @see org.eclipse.ui.dialogs.FilteredTree
 * @since 3.8
 * 
 */
public class ExtensionsPatternFilter extends PatternFilter {

	// TODO related attributes should be configured in preferences
	public static final String[] RELATED_ATTRIBUTES = {"label", //$NON-NLS-1$
			"id", "class", "commandId", "value", "pattern", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
			"locationURI", "defaultHandler"}; //$NON-NLS-1$ //$NON-NLS-2$ 

	protected String[] valuePatterns = null;
	protected String searchPattern;

	protected Set matchingLeafs = new HashSet();

	/**
	 * Check if the current (leaf) element is a match with the filter text. The
	 * default behavior checks that the label of the element is a match.
	 * 
	 * Subclasses should override this method.
	 * 
	 * @param viewer
	 *            the viewer that contains the element
	 * @param element
	 *            the tree element to check
	 * @return true if the given element's label matches the filter text
	 */
	protected boolean isLeafMatch(Viewer viewer, Object element) {
		Boolean foundAny = (Boolean) foundAnyCache.get(element);
		if (foundAny != null) {
			return foundAny.booleanValue();
		}

		// match label; default behaviour
		if (viewer != null && super.isLeafMatch(viewer, element)) {
			return true;
		}

		// match all splitted attribute's values of IPluginElement against splitted filter patterns
		if (element instanceof IPluginElement) {
			if (valuePatterns != null && valuePatterns.length > 0) {
				for (int j = 0; j < valuePatterns.length; j++) {
					String valuePattern = valuePatterns[j];
					if (valuePattern != null && valuePattern.length() > 0) {
						IPluginElement pluginElement = (IPluginElement) element;
						int attributeCount = pluginElement.getAttributeCount();
						IPluginAttribute[] pluginAttributes = pluginElement.getAttributes();
						for (int i = 0; i < attributeCount; i++) {
							IPluginAttribute attribute = pluginAttributes[i];
							if (attribute != null && attribute.getValue() != null) {
								String[] attributes = attribute.getValue().replaceAll("/{1,}", "/").split("/"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
								if (attributes != null) {
									for (int k = 0; k < attributes.length; k++) {
										String value = attributes[k];
										if (value != null && value.length() > 0) {
											if (!value.startsWith("%")) { //$NON-NLS-1$
												int delimiterPosition = value.indexOf('?'); // strip right of '?'
												if (delimiterPosition != -1) {
													value = value.substring(0, delimiterPosition);
												}
											} else {
												String resourceValue = pluginElement.getResourceString(value);
												value = (resourceValue != null && resourceValue.length() > 0) ? resourceValue : value;
											}
											if (value.toLowerCase().equals(valuePattern.toLowerCase())) {
												return true;
											}
										}
									}
								}
							}
						}
						if (valuePattern.equalsIgnoreCase(pluginElement.getName())) {
							return true;
						}
					}
				}
			}
		}
		return false;
	}

	public Object[] filter(Viewer viewer, Object parent, Object[] elements) {
		if (!useCache) {
			return super.filter(viewer, parent, elements);
		}
		if (parent != null && parent instanceof BundlePlugin) {
			if (foundAnyCache.keySet().size() == 0) {
				BundlePlugin pluginPlugin = (BundlePlugin) parent;
				doFilter(viewer, pluginPlugin, pluginPlugin.getExtensions());
			}
		}
		return super.filter(viewer, parent, elements);
	}

	protected boolean doFilter(Viewer viewer, Object parent, IPluginObject[] children) {
		boolean isParentMatch = false;
		Object parentMatch = foundAnyCache.get(parent);
		if (parentMatch != null) {
			isParentMatch = ((Boolean) parentMatch).booleanValue();
		}

		// find leaf matches
		boolean isAnyLeafMatch = false;
		for (int j = 0; j < children.length; j++) {
			IPluginObject iPluginObject = children[j];
			boolean isChildMatch = true;
			if (!isParentMatch) {
				isChildMatch = this.isLeafMatch(viewer, iPluginObject);
				isAnyLeafMatch |= isChildMatch;
				if (isChildMatch) {
					matchingLeafs.add(iPluginObject);
				}
			}
			foundAnyCache.put(iPluginObject, Boolean.valueOf(isChildMatch));
		}

		// traverse children when available
		boolean isAnyChildMatch = false;
		for (int i = 0; i < children.length; i++) {
			IPluginObject iPluginObject = children[i];
			if (iPluginObject instanceof IPluginParent) {
				IPluginParent pluginElement = (IPluginParent) iPluginObject;
				if (pluginElement.getChildren().length > 0) {
					boolean isChildrenMatch = doFilter(viewer, pluginElement, pluginElement.getChildren());
					isAnyChildMatch |= isChildrenMatch;
					if (isChildrenMatch) {
						foundAnyCache.put(iPluginObject, Boolean.TRUE);
						isParentMatch = true;
					}
				}
			}
		}
		return isAnyChildMatch | isAnyLeafMatch;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
	 */
	public boolean select(Viewer viewer, Object parentElement, Object element) {
		if (useCache) {
			Object cachedResult = foundAnyCache.get(element);
			if (cachedResult != null) {
				return ((Boolean) cachedResult).booleanValue();
			}
		}
		return isLeafMatch(viewer, element);
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.ui.dialogs.PatternFilter#setPattern(java.lang.String)
	 */
	public final void setPattern(String patternString) {
		super.setPattern(patternString);
		searchPattern = patternString;
		valuePatterns = patternString.replaceAll("/{1,}", "/").split("/"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
	}

	public String getPattern() {
		return searchPattern;
	}

	public void clearMatchingLeafs() {
		matchingLeafs.clear();
	}

	public Object[] getMatchingLeafsAsArray() {
		return matchingLeafs.toArray();
	}

	public void addMatchingLeafs(List children) {
		System.out.println(matchingLeafs.size());
		matchingLeafs.addAll(children);
		System.out.println(matchingLeafs.size());
	}

	/**
	 * Can be called to turn on caching.
	 * 
	 * @param useCache
	 *            The useCache to set.
	 */
	public void setUseCacheForSearch(boolean useCache) {
		this.useCache = useCache;
	}

}




/**
 * 
 */
package org.eclipse.pde.internal.ui.search;

import org.eclipse.core.runtime.*;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.pde.internal.core.bundle.BundlePlugin;
import org.eclipse.pde.internal.core.search.ISearchResultCollector;
import org.eclipse.pde.internal.core.search.PluginSearchInput;
import org.eclipse.search.ui.ISearchQuery;
import org.eclipse.search.ui.ISearchResult;
import org.eclipse.search.ui.text.AbstractTextSearchResult;

/**
 * @author zour
 *
 */
public class FindExtensionsByAttributeQuery implements ISearchQuery {

	private SearchResult fSearchResult;

	private PluginSearchInput fSearchInput;

	public FindExtensionsByAttributeQuery(IStructuredSelection selection, PluginSearchInput input) {
		fSearchInput = input;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.search.ui.ISearchQuery#run(org.eclipse.core.runtime.IProgressMonitor)
	 */
	public IStatus run(IProgressMonitor monitor) throws OperationCanceledException {
		final AbstractTextSearchResult result = (AbstractTextSearchResult) getSearchResult();
		result.removeAll();
		ISearchResultCollector collector = new ISearchResultCollector() {
			public void accept(Object match) {
				if (match instanceof BundlePlugin) {
					BundlePlugin plugin = (BundlePlugin) match;
					result.addMatch(new AttributesMatch(plugin, fSearchInput.getSearchString()));
				}
			}
		};
		ExtensionElementSearchOperation op = new ExtensionElementSearchOperation(fSearchInput, collector);
		op.execute(monitor);
		monitor.done();
		return Status.OK_STATUS;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.search.ui.ISearchQuery#getLabel()
	 */
	public String getLabel() {
		return fSearchInput.getSearchString();
	}

	/* (non-Javadoc)
	 * @see org.eclipse.search.ui.ISearchQuery#canRerun()
	 */
	public boolean canRerun() {
		return true;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.search.ui.ISearchQuery#canRunInBackground()
	 */
	public boolean canRunInBackground() {
		return true;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.search.ui.ISearchQuery#getSearchResult()
	 */
	public ISearchResult getSearchResult() {
		if (fSearchResult == null)
			fSearchResult = new SearchResult(this);
		return fSearchResult;
	}

	public PluginSearchInput getPluginSearchInput() {
		return fSearchInput;
	}

}

Lines 7-12 Link Here

(-)a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/ManifestEditorOpener.java (-5 / +19 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* Sascha Becher <s.becher@qualitype.de> - bug 360894
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.pde.internal.ui.search;	12	package org.eclipse.pde.internal.ui.search;
12		13
Lines 16-25 Link Here
16	import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase;	17	import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase;
17	import org.eclipse.pde.internal.core.ibundle.IManifestHeader;	18	import org.eclipse.pde.internal.core.ibundle.IManifestHeader;
18	import org.eclipse.pde.internal.core.text.plugin.PluginObjectNode;	19	import org.eclipse.pde.internal.core.text.plugin.PluginObjectNode;
19	import org.eclipse.pde.internal.ui.editor.plugin.ManifestEditor;	20	import org.eclipse.pde.internal.ui.editor.plugin.*;
20	import org.eclipse.search.ui.text.Match;	21	import org.eclipse.search.ui.text.Match;
21	import org.eclipse.ui.IEditorPart;	22	import org.eclipse.ui.IEditorPart;
22	import org.eclipse.ui.PartInitException;	23	import org.eclipse.ui.PartInitException;
		24	import org.eclipse.ui.forms.IFormPart;
		25	import org.eclipse.ui.forms.IManagedForm;
		26	import org.eclipse.ui.forms.editor.IFormPage;
23	import org.osgi.framework.Constants;	27	import org.osgi.framework.Constants;
24		28
25	// TODO this needs a rewrite	29	// TODO this needs a rewrite
Lines 30-39 Link Here
30	editorPart = ManifestEditor.open(match.getElement(), true);	34	editorPart = ManifestEditor.open(match.getElement(), true);
31	if (editorPart != null && editorPart instanceof ManifestEditor) {	35	if (editorPart != null && editorPart instanceof ManifestEditor) {
32	ManifestEditor editor = (ManifestEditor) editorPart;	36	ManifestEditor editor = (ManifestEditor) editorPart;
33	IDocument doc = editor.getDocument(match);	37	if (match.getBaseUnit() != AttributesMatch.UNIT_ATTRIBUTE_SEARCH_PATTERN) {
34	if (doc != null) {	38	IDocument doc = editor.getDocument(match);
35	Match exact = findExactMatch(doc, match, editor);	39	if (doc != null) {
36	editor.openToSourcePage(match.getElement(), exact.getOffset(), exact.getLength());	40	Match exact = findExactMatch(doc, match, editor);
		41	editor.openToSourcePage(match.getElement(), exact.getOffset(), exact.getLength());
		42	}
		43	} else { // open to extensions page and initialize filter with search result's pattern text
		44	IFormPage page = editor.setActivePage(ExtensionsPage.PAGE_ID);
		45	IManagedForm form = page.getManagedForm();
		46	IFormPart parts[] = form.getParts();
		47	if (parts != null && parts.length > 0) {
		48	ExtensionsSection section = (ExtensionsSection) parts[0];
		49	section.getFormFilteredTree().getFilterControl().setText(((AttributesMatch) match).getSearchPattern());
		50	}
37	}	51	}
38	}	52	}
39	return editorPart;	53	return editorPart;

Lines 7-12 Link Here

(-)a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/SearchResult.java (-1 / +8 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* Sascha Becher <s.becher@qualitype.de> - bug 360894
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.pde.internal.ui.search;	12	package org.eclipse.pde.internal.ui.search;
12		13
Lines 29-37 Link Here
29		30
30	public class SearchResult extends AbstractTextSearchResult implements IEditorMatchAdapter {	31	public class SearchResult extends AbstractTextSearchResult implements IEditorMatchAdapter {
31	protected ISearchQuery fQuery;	32	protected ISearchQuery fQuery;
		33	private final ImageDescriptor fImage;
32		34
33	public SearchResult(ISearchQuery query) {	35	public SearchResult(ISearchQuery query) {
34	fQuery = query;	36	fQuery = query;
		37	if (fQuery instanceof FindExtensionsByAttributeQuery) {
		38	fImage = PDEPluginImages.DESC_ESEARCH_OBJ;
		39	} else {
		40	fImage = PDEPluginImages.DESC_PSEARCH_OBJ;
		41	}
35	}	42	}
36		43
37	/* (non-Javadoc)	44	/* (non-Javadoc)
Lines 60-66 Link Here
60	* @see org.eclipse.search.ui.ISearchResult#getImageDescriptor()	67	* @see org.eclipse.search.ui.ISearchResult#getImageDescriptor()
61	*/	68	*/
62	public ImageDescriptor getImageDescriptor() {	69	public ImageDescriptor getImageDescriptor() {
63	return PDEPluginImages.DESC_PSEARCH_OBJ;	70	return fImage;
64	}	71	}
65		72
66	/* (non-Javadoc)	73	/* (non-Javadoc)

Return to bug 360894

Added Link Here

(-)a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEPluginImages.java (+7 lines)
153	public static final ImageDescriptor DESC_INFO_ST_OBJ = create(PATH_OBJ, "info_st_obj.gif"); //$NON-NLS-1$	153	public static final ImageDescriptor DESC_INFO_ST_OBJ = create(PATH_OBJ, "info_st_obj.gif"); //$NON-NLS-1$
154	public static final ImageDescriptor DESC_CATEGORY_OBJ = create(PATH_OBJ, "category_obj.gif"); //$NON-NLS-1$	154	public static final ImageDescriptor DESC_CATEGORY_OBJ = create(PATH_OBJ, "category_obj.gif"); //$NON-NLS-1$
155	public static final ImageDescriptor DESC_PSEARCH_OBJ = create(PATH_OBJ, "psearch_obj.gif"); //$NON-NLS-1$	155	public static final ImageDescriptor DESC_PSEARCH_OBJ = create(PATH_OBJ, "psearch_obj.gif"); //$NON-NLS-1$
156	public static final ImageDescriptor DESC_ESEARCH_OBJ = create(PATH_OBJ, "esearch_obj.gif"); //$NON-NLS-1$
156	public static final ImageDescriptor DESC_SITE_OBJ = create(PATH_OBJ, "site_obj.gif"); //$NON-NLS-1$	157	public static final ImageDescriptor DESC_SITE_OBJ = create(PATH_OBJ, "site_obj.gif"); //$NON-NLS-1$
157	public static final ImageDescriptor DESC_JUNIT_MAIN_TAB = create(PATH_OBJ, "test.gif"); //$NON-NLS-1$	158	public static final ImageDescriptor DESC_JUNIT_MAIN_TAB = create(PATH_OBJ, "test.gif"); //$NON-NLS-1$
158	public static final ImageDescriptor DESC_OUTPUT_FOLDER_OBJ = create(PATH_OBJ, "output_folder_attrib.gif"); //$NON-NLS-1$	159	public static final ImageDescriptor DESC_OUTPUT_FOLDER_OBJ = create(PATH_OBJ, "output_folder_attrib.gif"); //$NON-NLS-1$
Added Link Here
232	public static final ImageDescriptor DESC_VERTICAL = create(PATH_LCL, "th_vertical.gif"); //$NON-NLS-1$	233	public static final ImageDescriptor DESC_VERTICAL = create(PATH_LCL, "th_vertical.gif"); //$NON-NLS-1$
233	public static final ImageDescriptor DESC_COLLAPSE_ALL = create(PATH_LCL, "collapseall.gif"); //$NON-NLS-1$	234	public static final ImageDescriptor DESC_COLLAPSE_ALL = create(PATH_LCL, "collapseall.gif"); //$NON-NLS-1$
234	public static final ImageDescriptor DESC_COLLAPSE_ALL_MINI = create(PATH_LCL, "collapse_all_mini.gif"); //$NON-NLS-1$	235	public static final ImageDescriptor DESC_COLLAPSE_ALL_MINI = create(PATH_LCL, "collapse_all_mini.gif"); //$NON-NLS-1$
236	public static final ImageDescriptor DESC_TOGGLE_EXPAND_STATE = create(PATH_LCL, "toggle_expand_state.gif"); //$NON-NLS-1$
235	public static final ImageDescriptor DESC_HELP = create(PATH_LCL, "help.gif"); //$NON-NLS-1$	237	public static final ImageDescriptor DESC_HELP = create(PATH_LCL, "help.gif"); //$NON-NLS-1$
236	public static final ImageDescriptor DESC_LINK_WITH_EDITOR = create(PATH_LCL, "synced.gif"); //$NON-NLS-1$	238	public static final ImageDescriptor DESC_LINK_WITH_EDITOR = create(PATH_LCL, "synced.gif"); //$NON-NLS-1$
237	public static final ImageDescriptor DESC_CALLEES = create(PATH_LCL, "ch_callees.gif"); //$NON-NLS-1$	239	public static final ImageDescriptor DESC_CALLEES = create(PATH_LCL, "ch_callees.gif"); //$NON-NLS-1$
Added Link Here
242	public static final ImageDescriptor DESC_HISTORY_LIST = create(PATH_LCL, "history_list.gif"); //$NON-NLS-1$	244	public static final ImageDescriptor DESC_HISTORY_LIST = create(PATH_LCL, "history_list.gif"); //$NON-NLS-1$
243	public static final ImageDescriptor DESC_CLEAR = create(PATH_LCL, "clear.gif"); //$NON-NLS-1$	245	public static final ImageDescriptor DESC_CLEAR = create(PATH_LCL, "clear.gif"); //$NON-NLS-1$
244	public static final ImageDescriptor DESC_FILTER = create(PATH_LCL, "filter_ps.gif"); //$NON-NLS-1$	246	public static final ImageDescriptor DESC_FILTER = create(PATH_LCL, "filter_ps.gif"); //$NON-NLS-1$
247	public static final ImageDescriptor DESC_FILTER_RELATED = create(PATH_LCL, "filter_related.gif"); //$NON-NLS-1$
248	public static final ImageDescriptor DESC_SEARCH_EXTENSIONS = create(PATH_LCL, "search_extensions.gif"); //$NON-NLS-1$
245		249
246	public static final ImageDescriptor DESC_ADD_ATT_DISABLED = create(PATH_LCL_DISABLED, "add_att.gif"); //$NON-NLS-1$	250	public static final ImageDescriptor DESC_ADD_ATT_DISABLED = create(PATH_LCL_DISABLED, "add_att.gif"); //$NON-NLS-1$
247	public static final ImageDescriptor DESC_ALPHAB_SORT_CO_DISABLED = create(PATH_LCL_DISABLED, "alphab_sort_co.gif"); //$NON-NLS-1$	251	public static final ImageDescriptor DESC_ALPHAB_SORT_CO_DISABLED = create(PATH_LCL_DISABLED, "alphab_sort_co.gif"); //$NON-NLS-1$
Added Link Here
255	public static final ImageDescriptor DESC_HORIZONTAL_DISABLED = create(PATH_LCL_DISABLED, "th_horizontal.gif"); //$NON-NLS-1$	259	public static final ImageDescriptor DESC_HORIZONTAL_DISABLED = create(PATH_LCL_DISABLED, "th_horizontal.gif"); //$NON-NLS-1$
256	public static final ImageDescriptor DESC_VERTICAL_DISABLED = create(PATH_LCL_DISABLED, "th_vertical.gif"); //$NON-NLS-1$	260	public static final ImageDescriptor DESC_VERTICAL_DISABLED = create(PATH_LCL_DISABLED, "th_vertical.gif"); //$NON-NLS-1$
257	public static final ImageDescriptor DESC_COLLAPSE_ALL_DISABLED = create(PATH_LCL_DISABLED, "collapseall.gif"); //$NON-NLS-1$	261	public static final ImageDescriptor DESC_COLLAPSE_ALL_DISABLED = create(PATH_LCL_DISABLED, "collapseall.gif"); //$NON-NLS-1$
262	public static final ImageDescriptor DESC_TOGGLE_EXPAND_STATE_DISABLED = create(PATH_LCL_DISABLED, "toggle_expand_state.gif"); //$NON-NLS-1$
258	public static final ImageDescriptor DESC_LINK_WITH_EDITOR_DISABLED = create(PATH_LCL_DISABLED, "synced.gif"); //$NON-NLS-1$	263	public static final ImageDescriptor DESC_LINK_WITH_EDITOR_DISABLED = create(PATH_LCL_DISABLED, "synced.gif"); //$NON-NLS-1$
259	public static final ImageDescriptor DESC_CALLEES_DISABLED = create(PATH_LCL_DISABLED, "ch_callees.gif"); //$NON-NLS-1$	264	public static final ImageDescriptor DESC_CALLEES_DISABLED = create(PATH_LCL_DISABLED, "ch_callees.gif"); //$NON-NLS-1$
260	public static final ImageDescriptor DESC_CALLERS_DISABLED = create(PATH_LCL_DISABLED, "ch_callers.gif"); //$NON-NLS-1$	265	public static final ImageDescriptor DESC_CALLERS_DISABLED = create(PATH_LCL_DISABLED, "ch_callers.gif"); //$NON-NLS-1$
Added Link Here
264	public static final ImageDescriptor DESC_HISTORY_LIST_DISABLED = create(PATH_LCL_DISABLED, "history_list.gif"); //$NON-NLS-1$	269	public static final ImageDescriptor DESC_HISTORY_LIST_DISABLED = create(PATH_LCL_DISABLED, "history_list.gif"); //$NON-NLS-1$
265	public static final ImageDescriptor DESC_DCLEAR = create(PATH_LCL_DISABLED, "clear.gif"); //$NON-NLS-1$	270	public static final ImageDescriptor DESC_DCLEAR = create(PATH_LCL_DISABLED, "clear.gif"); //$NON-NLS-1$
266	public static final ImageDescriptor DESC_FILTER_DISABLED = create(PATH_LCL_DISABLED, "filter_ps.gif"); //$NON-NLS-1$	271	public static final ImageDescriptor DESC_FILTER_DISABLED = create(PATH_LCL_DISABLED, "filter_ps.gif"); //$NON-NLS-1$
272	public static final ImageDescriptor DESC_FILTER_RELATED_DISABLED = create(PATH_LCL_DISABLED, "filter_related.gif"); //$NON-NLS-1$
273	public static final ImageDescriptor DESC_SEARCH_EXTENSIONS_DISABLED = create(PATH_LCL_DISABLED, "search_extensions.gif"); //$NON-NLS-1$
267		274
268	public static final ImageDescriptor DESC_RUN_EXC = create(PATH_OBJ, "run_exc.gif"); //$NON-NLS-1$	275	public static final ImageDescriptor DESC_RUN_EXC = create(PATH_OBJ, "run_exc.gif"); //$NON-NLS-1$
269	public static final ImageDescriptor DESC_DEBUG_EXC = create(PATH_OBJ, "debug_exc.gif"); //$NON-NLS-1$	276	public static final ImageDescriptor DESC_DEBUG_EXC = create(PATH_OBJ, "debug_exc.gif"); //$NON-NLS-1$

Added Link Here

(-)a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/actions/FilterRelatedExtensionsAction.java (+135 lines)
1	/*******************************************************************************
2	* Copyright (c) 2011, 2012 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Sascha Becher <s.becher@qualitype.de> - bug 360894
10	*******************************************************************************/
11	package org.eclipse.pde.internal.ui.editor.actions;
12
13	import java.util.*;
14	import org.eclipse.jface.action.Action;
15	import org.eclipse.jface.viewers.IStructuredSelection;
16	import org.eclipse.jface.viewers.TreeViewer;
17	import org.eclipse.pde.core.plugin.IPluginAttribute;
18	import org.eclipse.pde.core.plugin.IPluginElement;
19	import org.eclipse.pde.internal.ui.PDEPluginImages;
20	import org.eclipse.pde.internal.ui.PDEUIMessages;
21	import org.eclipse.pde.internal.ui.editor.plugin.FormFilteredTree;
22	import org.eclipse.pde.internal.ui.search.ExtensionsPatternFilter;
23	import org.eclipse.swt.widgets.Text;
24	import org.eclipse.ui.PlatformUI;
25	import org.eclipse.ui.actions.ActionFactory;
26	import org.eclipse.ui.keys.IBindingService;
27
28	/**
29	* Serves as Filter Related Action in context menu of the extensions tree and toolbar icon on the same page
30	*
31	* @author Sascha Becher
32	*/
33	public class FilterRelatedExtensionsAction extends Action {
34
35	protected TreeViewer fExtensionTree;
36	protected FormFilteredTree fFilteredTree;
37
38	public FilterRelatedExtensionsAction(TreeViewer treeViewer, FormFilteredTree filteredTree) {
39	String filterBinding = ((IBindingService) PlatformUI.getWorkbench().getAdapter(IBindingService.class)).getBestActiveBindingFormattedFor(ActionFactory.FIND.getCommandId());
40	setImageDescriptor(PDEPluginImages.DESC_FILTER_RELATED);
41	setDisabledImageDescriptor(PDEPluginImages.DESC_FILTER_RELATED_DISABLED);
42	setText(PDEUIMessages.Actions_filter_relatedPluginElements + ((filterBinding != null) ? "\t" + filterBinding : "")); //$NON-NLS-1$ //$NON-NLS-2$
43
44	this.fExtensionTree = treeViewer;
45	this.fFilteredTree = filteredTree;
46	}
47
48	public void run() {
49	String filterPattern = getFilterRelatedPattern((IStructuredSelection) fExtensionTree.getSelection());
50	Text filterControl = fFilteredTree.getFilterControl();
51	if (filterControl != null && filterPattern.length() > 0) {
52	filterControl.setText(filterPattern);
53	}
54	}
55
56	/**
57	* Obtains common attributes from selected plugin element to filter tree for;
58	* attribute values are concatenated with a slash and set as filter text
59	*
60	* @param selection selected items to filter for related plugin elements
61	*/
62	public static String getFilterRelatedPattern(IStructuredSelection selection) {
63	Iterator it = selection.iterator();
64	Set filterPatterns = new HashSet();
65	while (it.hasNext()) {
66	Object treeElement = it.next();
67	if (treeElement instanceof IPluginElement) {
68	IPluginElement pluginElement = (IPluginElement) treeElement;
69	for (int i = 0; i < ExtensionsPatternFilter.RELATED_ATTRIBUTES.length; i++) {
70	String property = ExtensionsPatternFilter.RELATED_ATTRIBUTES[i];
71	IPluginAttribute attribute = pluginElement.getAttribute(property);
72	if (attribute != null && attribute.getValue() != null && attribute.getValue().length() > 0) {
73	String value = attribute.getValue();
74	if (!value.startsWith("%")) { //$NON-NLS-1$
75	int delimiterPosition = value.indexOf('?'); // split before '?' and right after last '='
76	if (delimiterPosition == -1) {
77	filterPatterns.add(value);
78	} else {
79	filterPatterns.add(value.substring(0, delimiterPosition));
80	int position = value.lastIndexOf('=');
81	if (position != -1) {
82	filterPatterns.add(value.substring(position + 1, value.length()));
83	}
84	}
85	} else {
86	String resourceValue = pluginElement.getResourceString(value);
87	if ((resourceValue != null && resourceValue.length() > 0)) {
88	filterPatterns.add(resourceValue);
89	}
90	}
91	}
92	}
93	}
94	}
95	StringBuffer patternBuffer = new StringBuffer();
96	for (Iterator iterator = filterPatterns.iterator(); iterator.hasNext();) {
97	Object pattern = iterator.next();
98	if (pattern != null) {
99	patternBuffer.append(pattern);
100	patternBuffer.append('/');
101	}
102	}
103	String filterPattern = patternBuffer.toString();
104	if (filterPattern.endsWith("/")) { //$NON-NLS-1$
105	filterPattern = filterPattern.substring(0, filterPattern.length() - 1);
106	}
107	return filterPattern;
108	}
109
110	public static boolean isFilterRelatedEnabled(IStructuredSelection structuredSelection) {
111	boolean createFilterRelatedAction = false;
112	if (structuredSelection != null && !structuredSelection.isEmpty()) {
113	Iterator it = structuredSelection.iterator();
114	while (it.hasNext()) {
115	Object treeElement = it.next();
116	if (treeElement instanceof IPluginElement) {
117	createFilterRelatedAction \|= isFilterRelatedEnabled((IPluginElement) treeElement);
118	}
119	}
120	}
121	return createFilterRelatedAction;
122	}
123
124	private static boolean isFilterRelatedEnabled(IPluginElement pluginElement) {
125	for (int i = 0; i < ExtensionsPatternFilter.RELATED_ATTRIBUTES.length; i++) {
126	String property = ExtensionsPatternFilter.RELATED_ATTRIBUTES[i];
127	IPluginAttribute attribute = pluginElement.getAttribute(property);
128	if (attribute != null) {
129	return true;
130	}
131	}
132	return false;
133	}
134
135	}

Added Link Here

(-)a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/FindExtensionsByAttributeQuery.java (+83 lines)
1	/**
2	*
3	*/
4	package org.eclipse.pde.internal.ui.search;
5
6	import org.eclipse.core.runtime.*;
7	import org.eclipse.jface.viewers.IStructuredSelection;
8	import org.eclipse.pde.internal.core.bundle.BundlePlugin;
9	import org.eclipse.pde.internal.core.search.ISearchResultCollector;
10	import org.eclipse.pde.internal.core.search.PluginSearchInput;
11	import org.eclipse.search.ui.ISearchQuery;
12	import org.eclipse.search.ui.ISearchResult;
13	import org.eclipse.search.ui.text.AbstractTextSearchResult;
14
15	/**
16	* @author zour
17	*
18	*/
19	public class FindExtensionsByAttributeQuery implements ISearchQuery {
20
21	private SearchResult fSearchResult;
22
23	private PluginSearchInput fSearchInput;
24
25	public FindExtensionsByAttributeQuery(IStructuredSelection selection, PluginSearchInput input) {
26	fSearchInput = input;
27	}
28
29	/* (non-Javadoc)
30	* @see org.eclipse.search.ui.ISearchQuery#run(org.eclipse.core.runtime.IProgressMonitor)
31	*/
32	public IStatus run(IProgressMonitor monitor) throws OperationCanceledException {
33	final AbstractTextSearchResult result = (AbstractTextSearchResult) getSearchResult();
34	result.removeAll();
35	ISearchResultCollector collector = new ISearchResultCollector() {
36	public void accept(Object match) {
37	if (match instanceof BundlePlugin) {
38	BundlePlugin plugin = (BundlePlugin) match;
39	result.addMatch(new AttributesMatch(plugin, fSearchInput.getSearchString()));
40	}
41	}
42	};
43	ExtensionElementSearchOperation op = new ExtensionElementSearchOperation(fSearchInput, collector);
44	op.execute(monitor);
45	monitor.done();
46	return Status.OK_STATUS;
47	}
48
49	/* (non-Javadoc)
50	* @see org.eclipse.search.ui.ISearchQuery#getLabel()
51	*/
52	public String getLabel() {
53	return fSearchInput.getSearchString();
54	}
55
56	/* (non-Javadoc)
57	* @see org.eclipse.search.ui.ISearchQuery#canRerun()
58	*/
59	public boolean canRerun() {
60	return true;
61	}
62
63	/* (non-Javadoc)
64	* @see org.eclipse.search.ui.ISearchQuery#canRunInBackground()
65	*/
66	public boolean canRunInBackground() {
67	return true;
68	}
69
70	/* (non-Javadoc)
71	* @see org.eclipse.search.ui.ISearchQuery#getSearchResult()
72	*/
73	public ISearchResult getSearchResult() {
74	if (fSearchResult == null)
75	fSearchResult = new SearchResult(this);
76	return fSearchResult;
77	}
78
79	public PluginSearchInput getPluginSearchInput() {
80	return fSearchInput;
81	}
82
83	}