Attachment #125342 for bug #263870

Lines 15-21 Link Here

(-)META-INF/MANIFEST.MF (-1 / +2 lines)
15	org.eclipse.mylyn.context.core;bundle-version="[3.0.0,4.0.0)",	15	org.eclipse.mylyn.context.core;bundle-version="[3.0.0,4.0.0)",
16	org.eclipse.mylyn.context.ui;bundle-version="[3.0.0,4.0.0)",	16	org.eclipse.mylyn.context.ui;bundle-version="[3.0.0,4.0.0)",
17	org.eclipse.mylyn.monitor.ui;bundle-version="[3.0.0,4.0.0)",	17	org.eclipse.mylyn.monitor.ui;bundle-version="[3.0.0,4.0.0)",
18	org.eclipse.mylyn.monitor.core;bundle-version="[3.0.0,4.0.0)"	18	org.eclipse.mylyn.monitor.core;bundle-version="[3.0.0,4.0.0)",
		19	org.eclipse.core.expressions
19	Bundle-ActivationPolicy: lazy	20	Bundle-ActivationPolicy: lazy
20	Bundle-Vendor: %Bundle-Vendor	21	Bundle-Vendor: %Bundle-Vendor
21	Export-Package: org.eclipse.mylyn.internal.resources.ui;x-internal:=true,	22	Export-Package: org.eclipse.mylyn.internal.resources.ui;x-internal:=true,




package org.eclipse.mylyn.resources.ui;

import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;

import org.eclipse.core.expressions.Expression;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;

import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.jface.viewers.ViewerFilter;
import org.eclipse.mylyn.commons.core.StatusHandler;
import org.eclipse.mylyn.context.ui.AbstractAutoFocusViewAction;
import org.eclipse.mylyn.context.ui.InterestFilter;
import org.eclipse.mylyn.internal.context.ui.ContextUiPlugin;
import org.eclipse.mylyn.internal.resources.ui.ResourcesUiBridgePlugin;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IViewPart;
import org.eclipse.ui.internal.navigator.NavigatorContentService;
import org.eclipse.ui.internal.navigator.actions.LinkEditorAction;
import org.eclipse.ui.internal.navigator.filters.CommonFilterDescriptor;
import org.eclipse.ui.internal.navigator.filters.CommonFilterDescriptorManager;
import org.eclipse.ui.internal.navigator.filters.CoreExpressionFilter;
import org.eclipse.ui.internal.navigator.filters.SelectFiltersAction;
import org.eclipse.ui.navigator.CommonNavigator;
import org.eclipse.ui.navigator.ILinkHelper;


	private CommonNavigator commonNavigator;

	private CommonFilterDescriptor[] filterDescriptors;

	private Field filterExpressionField1;

	private Field filterExpressionField2;

	public FocusCommonNavigatorAction(InterestFilter interestFilter, boolean manageViewer, boolean manageFilters,
			boolean manageLinking) {
		super(interestFilter, manageViewer, manageFilters, manageLinking);
	}

	@Override
	protected boolean installInterestFilter(StructuredViewer viewer) {
		if (commonNavigator == null) {
			commonNavigator = (CommonNavigator) super.getPartForAction();
		}

		try {
			// XXX: reflection
			Class<?> clazz2 = CoreExpressionFilter.class;
			filterExpressionField1 = clazz2.getDeclaredField("filterExpression");
			filterExpressionField1.setAccessible(true);

			Class<?> clazz1 = CommonFilterDescriptor.class;
			filterExpressionField2 = clazz1.getDeclaredField("filterExpression");
			filterExpressionField2.setAccessible(true);
		} catch (Exception e) {
			StatusHandler.log(new Status(IStatus.ERROR, ResourcesUiBridgePlugin.ID_PLUGIN,
					"Could not determine filter", e)); //$NON-NLS-1$
		}

		filterDescriptors = CommonFilterDescriptorManager.getInstance().findVisibleFilters(
				commonNavigator.getNavigatorContentService());

		return super.installInterestFilter(viewer);
	}

	@Override
	protected ISelection resolveSelection(IEditorPart editor, ITextSelection changedSelection, StructuredViewer viewer)
			throws CoreException {
		if (resolveFailed) {
			return null;
		}
		if (commonNavigator == null) {
			commonNavigator = (CommonNavigator) super.getPartForAction();
		}
		if (linkServiceMethod == null) {
			// TODO e3.5 replace with call to CommonNavigator.getLinkHelperService()
			try {

		return false;
	}

	@Override
	protected boolean isPreservedFilter(ViewerFilter filter) {
		if (filter instanceof CoreExpressionFilter) {
			CoreExpressionFilter expressionFilter = (CoreExpressionFilter) filter;

			Set<String> preservedIds = ContextUiPlugin.getDefault().getPreservedFilterIds(viewPart.getSite().getId());
			if (!preservedIds.isEmpty()) {

				Expression expression2;
				try {
					expression2 = (Expression) filterExpressionField1.get(expressionFilter);

					for (CommonFilterDescriptor commonFilterDescriptor : filterDescriptors) {
						if (preservedIds.contains(commonFilterDescriptor.getId())) {

							Expression expression1 = (Expression) filterExpressionField2.get(commonFilterDescriptor);

							if (expression1 != null && expression1.equals(expression2)) {
								return true;
							}
						}
					}
				} catch (IllegalArgumentException e) {
					StatusHandler.log(new Status(IStatus.ERROR, ResourcesUiBridgePlugin.ID_PLUGIN,
							"Could not determine filter", e)); //$NON-NLS-1$
				} catch (IllegalAccessException e) {
					StatusHandler.log(new Status(IStatus.ERROR, ResourcesUiBridgePlugin.ID_PLUGIN,
							"Could not determine filter", e)); //$NON-NLS-1$
				}
			}
		}
		return false;
	}

	/**
	 * Copied from
	 * 

Added Link Here

(-).refactorings/2009/2/7/refactorings.history (+3 lines)
1	<?xml version="1.0" encoding="UTF-8"?>
2	<session version="1.0"> <refactoring comment="Rename local variable 'field1' in 'org.eclipse.mylyn.resources.ui.FocusCommonNavigatorAction.isPreservedFilter(...)' to 'filterExpressionField1' - Original project: 'org.eclipse.mylyn.resources.ui' - Original element: 'org.eclipse.mylyn.resources.ui.FocusCommonNavigatorAction.isPreservedFilter(ViewerFilter).field1' - Renamed element: 'field1' - Update references to refactored element" description="Rename local variable 'field1'" id="org.eclipse.jdt.ui.rename.local.variable" input="/src<org.eclipse.mylyn.resources.ui{FocusCommonNavigatorAction.java[FocusCommonNavigatorAction~isPreservedFilter~QViewerFilter;@field1!7728!7786!7734!7739!QField;" name="filterExpressionField1" references="true" stamp="1234315572339" version="1.0"/> <refactoring comment="Rename local variable 'filterExpressionField1' in 'org.eclipse.mylyn.resources.ui.FocusCommonNavigatorAction.isPreservedFilter(...)' to 'filterExpressionField2' - Original project: 'org.eclipse.mylyn.resources.ui' - Original element: 'org.eclipse.mylyn.resources.ui.FocusCommonNavigatorAction.isPreservedFilter(ViewerFilter).filterExpressionField1' - Renamed element: 'filterExpressionField1' - Update references to refactored element" description="Rename local variable 'filterExpressionField1'" id="org.eclipse.jdt.ui.rename.local.variable" input="/src<org.eclipse.mylyn.resources.ui{FocusCommonNavigatorAction.java[FocusCommonNavigatorAction~isPreservedFilter~QViewerFilter;@filterExpressionField1!7728!7802!7734!7755!QField;" name="filterExpressionField2" references="true" stamp="1234315580336" version="1.0"/> <refactoring comment="Rename local variable 'field2' in 'org.eclipse.mylyn.resources.ui.FocusCommonNavigatorAction.isPreservedFilter(...)' to 'filterExpressionField1' - Original project: 'org.eclipse.mylyn.resources.ui' - Original element: 'org.eclipse.mylyn.resources.ui.FocusCommonNavigatorAction.isPreservedFilter(ViewerFilter).field2' - Renamed element: 'field2' - Update references to refactored element" description="Rename local variable 'field2'" id="org.eclipse.jdt.ui.rename.local.variable" input="/src<org.eclipse.mylyn.resources.ui{FocusCommonNavigatorAction.java[FocusCommonNavigatorAction~isPreservedFilter~QViewerFilter;@field2!8032!8090!8038!8043!QField;" name="filterExpressionField1" references="true" stamp="1234315592283" version="1.0"/> <refactoring comment="Convert local variable 'org.eclipse.mylyn.resources.ui.FocusCommonNavigatorAction.installInterestFilter().filterExpressionField2' in 'org.eclipse.mylyn.resources.ui.FocusCommonNavigatorAction.installInterestFilter()' to field - Original project: 'org.eclipse.mylyn.resources.ui' - Original element: 'org.eclipse.mylyn.resources.ui.FocusCommonNavigatorAction.installInterestFilter().filterExpressionField2' - Field name: 'filterExpressionField2' - Initialize field in method - Declared visibility: 'private'" description="Convert local variable 'filterExpressionField2' to field" final="false" flags="2" id="org.eclipse.jdt.ui.promote.temp" initialize="1" input="/src<org.eclipse.mylyn.resources.ui{FocusCommonNavigatorAction.java" name="filterExpressionField2" selection="3188 0" stamp="1234315657460" static="false" version="1.0" visibility="2"/> <refactoring comment="Convert local variable 'org.eclipse.mylyn.resources.ui.FocusCommonNavigatorAction.installInterestFilter().filterExpressionField1' in 'org.eclipse.mylyn.resources.ui.FocusCommonNavigatorAction.installInterestFilter()' to field - Original project: 'org.eclipse.mylyn.resources.ui' - Original element: 'org.eclipse.mylyn.resources.ui.FocusCommonNavigatorAction.installInterestFilter().filterExpressionField1' - Field name: 'filterExpressionField1' - Initialize field in method - Declared visibility: 'private'" description="Convert local variable 'filterExpressionField1' to field" final="false" flags="2" id="org.eclipse.jdt.ui.promote.temp" initialize="1" input="/src<org.eclipse.mylyn.resources.ui{FocusCommonNavigatorAction.java" name="filterExpressionField1" selection="3396 0" stamp="1234315664549" static="false" version="1.0" visibility="2"/>
3	</session>

Added Link Here

(-).refactorings/2009/2/7/refactorings.index (+5 lines)
1	1234315572339 Rename local variable 'field1'
2	1234315580336 Rename local variable 'filterExpressionField1'
3	1234315592283 Rename local variable 'field2'
4	1234315657460 Convert local variable 'filterExpressionField2' to field
5	1234315664549 Convert local variable 'filterExpressionField1' to field





			if (viewPart != null && manageFilters) {
				Set<ViewerFilter> toAdd = new HashSet<ViewerFilter>();
				Set<Class<?>> preservedFilterClasses = getPreservedFilterClasses();

				for (ViewerFilter filter : previousFilters.get(viewer)) {
					if (preservedFilterClasses.contains(filter.getClass()) || isPreservedFilter(filter)) {
						toAdd.add(filter);
					}
				}

		return false;
	}

	/**
	 * Subclasses can provide additional viewer filters that should not be removed when focusing.
	 * 
	 * @since 3.1
	 */
	protected boolean isPreservedFilter(ViewerFilter filter) {
		return false;
	}

	protected void uninstallInterestFilter(StructuredViewer viewer) {
		if (viewer == null) {
			// FIXME Assert.isNotNull(viewer)

Added Link Here

(-).refactorings/2009/2/7/refactorings.index (+3 lines)
1	1234309089116 Rename local variable 'excludedFilters'
2	1234310374262 Rename local variable 'excludedFilterClasses'
3	1234314997161 Rename method 'isCustomFilter'

Added Link Here

(-).refactorings/2009/2/7/refactorings.history (+3 lines)
1	<?xml version="1.0" encoding="UTF-8"?>
2	<session version="1.0"> <refactoring comment="Rename local variable 'excludedFilters' in 'org.eclipse.mylyn.context.ui.AbstractFocusViewAction.installInterestFilter(...)' to 'excludedFilterClasses' - Original project: 'org.eclipse.mylyn.context.ui' - Original element: 'org.eclipse.mylyn.context.ui.AbstractFocusViewAction.installInterestFilter(StructuredViewer).excludedFilters' - Renamed element: 'excludedFilters' - Update references to refactored element" description="Rename local variable 'excludedFilters'" id="org.eclipse.jdt.ui.rename.local.variable" input="/src<org.eclipse.mylyn.context.ui{AbstractFocusViewAction.java[AbstractFocusViewAction~installInterestFilter~QStructuredViewer;@excludedFilters!14974!15033!14988!15002!QSet" name="excludedFilterClasses" references="true" stamp="1234309089116" version="1.0"/> <refactoring comment="Rename local variable 'excludedFilterClasses' in 'org.eclipse.mylyn.context.ui.AbstractFocusViewAction.installInterestFilter(...)' to 'preservedFilterClasses' - Original project: 'org.eclipse.mylyn.context.ui' - Original element: 'org.eclipse.mylyn.context.ui.AbstractFocusViewAction.installInterestFilter(StructuredViewer).excludedFilterClasses' - Renamed element: 'excludedFilterClasses' - Update references to refactored element" description="Rename local variable 'excludedFilterClasses'" id="org.eclipse.jdt.ui.rename.local.variable" input="/src<org.eclipse.mylyn.context.ui{AbstractFocusViewAction.java[AbstractFocusViewAction~installInterestFilter~QStructuredViewer;@excludedFilterClasses!15552!15617!15566!15586!QSet" name="preservedFilterClasses" references="true" stamp="1234310374262" version="1.0"/> <refactoring comment="Rename method 'org.eclipse.mylyn.context.ui.AbstractFocusViewAction.isCustomFilter(...)' to 'isPreservedFilter' - Original project: 'org.eclipse.mylyn.context.ui' - Original element: 'org.eclipse.mylyn.context.ui.AbstractFocusViewAction.isCustomFilter(...)' - Renamed element: 'org.eclipse.mylyn.context.ui.AbstractFocusViewAction.isPreservedFilter(...)' - Update references to refactored element" delegate="false" deprecate="false" description="Rename method 'isCustomFilter'" flags="589830" id="org.eclipse.jdt.ui.rename.method" input="/src<org.eclipse.mylyn.context.ui{AbstractFocusViewAction.java[AbstractFocusViewAction~isCustomFilter~QViewerFilter;" name="isPreservedFilter" references="true" stamp="1234314997161" version="1.0"/>
3	</session>

Return to bug 263870

Lines 466-474 Link Here

(-)src/org/eclipse/mylyn/context/ui/AbstractFocusViewAction.java (-2 / +12 lines)
466		466
467	if (viewPart != null && manageFilters) {	467	if (viewPart != null && manageFilters) {
468	Set<ViewerFilter> toAdd = new HashSet<ViewerFilter>();	468	Set<ViewerFilter> toAdd = new HashSet<ViewerFilter>();
469	Set<Class<?>> excludedFilters = getPreservedFilterClasses();	469	Set<Class<?>> preservedFilterClasses = getPreservedFilterClasses();
		470
470	for (ViewerFilter filter : previousFilters.get(viewer)) {	471	for (ViewerFilter filter : previousFilters.get(viewer)) {
471	if (excludedFilters.contains(filter.getClass())) {	472	if (preservedFilterClasses.contains(filter.getClass()) \|\| isPreservedFilter(filter)) {
472	toAdd.add(filter);	473	toAdd.add(filter);
473	}	474	}
474	}	475	}
Lines 493-498 Link Here
493	return false;	494	return false;
494	}	495	}
495		496
		497	/**
		498	* Subclasses can provide additional viewer filters that should not be removed when focusing.
		499	*
		500	* @since 3.1
		501	*/
		502	protected boolean isPreservedFilter(ViewerFilter filter) {
		503	return false;
		504	}
		505
496	protected void uninstallInterestFilter(StructuredViewer viewer) {	506	protected void uninstallInterestFilter(StructuredViewer viewer) {
497	if (viewer == null) {	507	if (viewer == null) {
498	// FIXME Assert.isNotNull(viewer)	508	// FIXME Assert.isNotNull(viewer)

Lines 12-21 Link Here

(-)src/org/eclipse/mylyn/resources/ui/FocusCommonNavigatorAction.java (-3 / +74 lines)
12	package org.eclipse.mylyn.resources.ui;	12	package org.eclipse.mylyn.resources.ui;
13		13
14	import java.lang.reflect.Constructor;	14	import java.lang.reflect.Constructor;
		15	import java.lang.reflect.Field;
15	import java.lang.reflect.Method;	16	import java.lang.reflect.Method;
16	import java.util.ArrayList;	17	import java.util.ArrayList;
17	import java.util.List;	18	import java.util.List;
		19	import java.util.Set;
18		20
		21	import org.eclipse.core.expressions.Expression;
19	import org.eclipse.core.runtime.CoreException;	22	import org.eclipse.core.runtime.CoreException;
20	import org.eclipse.core.runtime.IStatus;	23	import org.eclipse.core.runtime.IStatus;
21	import org.eclipse.core.runtime.Status;	24	import org.eclipse.core.runtime.Status;
Lines 26-40 Link Here
26	import org.eclipse.jface.viewers.IStructuredSelection;	29	import org.eclipse.jface.viewers.IStructuredSelection;
27	import org.eclipse.jface.viewers.StructuredSelection;	30	import org.eclipse.jface.viewers.StructuredSelection;
28	import org.eclipse.jface.viewers.StructuredViewer;	31	import org.eclipse.jface.viewers.StructuredViewer;
		32	import org.eclipse.jface.viewers.ViewerFilter;
29	import org.eclipse.mylyn.commons.core.StatusHandler;	33	import org.eclipse.mylyn.commons.core.StatusHandler;
30	import org.eclipse.mylyn.context.ui.AbstractAutoFocusViewAction;	34	import org.eclipse.mylyn.context.ui.AbstractAutoFocusViewAction;
31	import org.eclipse.mylyn.context.ui.InterestFilter;	35	import org.eclipse.mylyn.context.ui.InterestFilter;
		36	import org.eclipse.mylyn.internal.context.ui.ContextUiPlugin;
32	import org.eclipse.mylyn.internal.resources.ui.ResourcesUiBridgePlugin;	37	import org.eclipse.mylyn.internal.resources.ui.ResourcesUiBridgePlugin;
33	import org.eclipse.ui.IEditorInput;	38	import org.eclipse.ui.IEditorInput;
34	import org.eclipse.ui.IEditorPart;	39	import org.eclipse.ui.IEditorPart;
35	import org.eclipse.ui.IViewPart;	40	import org.eclipse.ui.IViewPart;
36	import org.eclipse.ui.internal.navigator.NavigatorContentService;	41	import org.eclipse.ui.internal.navigator.NavigatorContentService;
37	import org.eclipse.ui.internal.navigator.actions.LinkEditorAction;	42	import org.eclipse.ui.internal.navigator.actions.LinkEditorAction;
		43	import org.eclipse.ui.internal.navigator.filters.CommonFilterDescriptor;
		44	import org.eclipse.ui.internal.navigator.filters.CommonFilterDescriptorManager;
		45	import org.eclipse.ui.internal.navigator.filters.CoreExpressionFilter;
38	import org.eclipse.ui.internal.navigator.filters.SelectFiltersAction;	46	import org.eclipse.ui.internal.navigator.filters.SelectFiltersAction;
39	import org.eclipse.ui.navigator.CommonNavigator;	47	import org.eclipse.ui.navigator.CommonNavigator;
40	import org.eclipse.ui.navigator.ILinkHelper;	48	import org.eclipse.ui.navigator.ILinkHelper;
Lines 53-72 Link Here
53		61
54	private CommonNavigator commonNavigator;	62	private CommonNavigator commonNavigator;
55		63
		64	private CommonFilterDescriptor[] filterDescriptors;
		65
		66	private Field filterExpressionField1;
		67
		68	private Field filterExpressionField2;
		69
56	public FocusCommonNavigatorAction(InterestFilter interestFilter, boolean manageViewer, boolean manageFilters,	70	public FocusCommonNavigatorAction(InterestFilter interestFilter, boolean manageViewer, boolean manageFilters,
57	boolean manageLinking) {	71	boolean manageLinking) {
58	super(interestFilter, manageViewer, manageFilters, manageLinking);	72	super(interestFilter, manageViewer, manageFilters, manageLinking);
59	}	73	}
60		74
61	@Override	75	@Override
		76	protected boolean installInterestFilter(StructuredViewer viewer) {
		77	if (commonNavigator == null) {
		78	commonNavigator = (CommonNavigator) super.getPartForAction();
		79	}
		80
		81	try {
		82	// XXX: reflection
		83	Class<?> clazz2 = CoreExpressionFilter.class;
		84	filterExpressionField1 = clazz2.getDeclaredField("filterExpression");
		85	filterExpressionField1.setAccessible(true);
		86
		87	Class<?> clazz1 = CommonFilterDescriptor.class;
		88	filterExpressionField2 = clazz1.getDeclaredField("filterExpression");
		89	filterExpressionField2.setAccessible(true);
		90	} catch (Exception e) {
		91	StatusHandler.log(new Status(IStatus.ERROR, ResourcesUiBridgePlugin.ID_PLUGIN,
		92	"Could not determine filter", e)); //$NON-NLS-1$
		93	}
		94
		95	filterDescriptors = CommonFilterDescriptorManager.getInstance().findVisibleFilters(
		96	commonNavigator.getNavigatorContentService());
		97
		98	return super.installInterestFilter(viewer);
		99	}
		100
		101	@Override
62	protected ISelection resolveSelection(IEditorPart editor, ITextSelection changedSelection, StructuredViewer viewer)	102	protected ISelection resolveSelection(IEditorPart editor, ITextSelection changedSelection, StructuredViewer viewer)
63	throws CoreException {	103	throws CoreException {
64	if (resolveFailed) {	104	if (resolveFailed) {
65	return null;	105	return null;
66	}	106	}
67	if (commonNavigator == null) {
68	commonNavigator = (CommonNavigator) super.getPartForAction();
69	}
70	if (linkServiceMethod == null) {	107	if (linkServiceMethod == null) {
71	// TODO e3.5 replace with call to CommonNavigator.getLinkHelperService()	108	// TODO e3.5 replace with call to CommonNavigator.getLinkHelperService()
72	try {	109	try {
Lines 171-176 Link Here
171	return false;	208	return false;
172	}	209	}
173		210
		211	@Override
		212	protected boolean isPreservedFilter(ViewerFilter filter) {
		213	if (filter instanceof CoreExpressionFilter) {
		214	CoreExpressionFilter expressionFilter = (CoreExpressionFilter) filter;
		215
		216	Set<String> preservedIds = ContextUiPlugin.getDefault().getPreservedFilterIds(viewPart.getSite().getId());
		217	if (!preservedIds.isEmpty()) {
		218
		219	Expression expression2;
		220	try {
		221	expression2 = (Expression) filterExpressionField1.get(expressionFilter);
		222
		223	for (CommonFilterDescriptor commonFilterDescriptor : filterDescriptors) {
		224	if (preservedIds.contains(commonFilterDescriptor.getId())) {
		225
		226	Expression expression1 = (Expression) filterExpressionField2.get(commonFilterDescriptor);
		227
		228	if (expression1 != null && expression1.equals(expression2)) {
		229	return true;
		230	}
		231	}
		232	}
		233	} catch (IllegalArgumentException e) {
		234	StatusHandler.log(new Status(IStatus.ERROR, ResourcesUiBridgePlugin.ID_PLUGIN,
		235	"Could not determine filter", e)); //$NON-NLS-1$
		236	} catch (IllegalAccessException e) {
		237	StatusHandler.log(new Status(IStatus.ERROR, ResourcesUiBridgePlugin.ID_PLUGIN,
		238	"Could not determine filter", e)); //$NON-NLS-1$
		239	}
		240	}
		241	}
		242	return false;
		243	}
		244
174	/**	245	/**
175	* Copied from	246	* Copied from
176	*	247	*