Attachment #110157 for bug #212389

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

Lines 314-320 Link Here

(-)src/org/eclipse/ui/navigator/NavigatorActionService.java (-1 / +1 lines)
314	}	314	}
315	}	315	}
316		316
317	private CommonActionProvider getActionProviderInstance(	317	CommonActionProvider getActionProviderInstance(
318	CommonActionProviderDescriptor aProviderDescriptor) {	318	CommonActionProviderDescriptor aProviderDescriptor) {
319	CommonActionProvider provider = null;	319	CommonActionProvider provider = null;
320	try {	320	try {




/*******************************************************************************
 * Copyright (c) 2008 Oakland Software Incorporated 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:
 *     Oakland Software Incorporated - initial API and implementation
 ******************************************************************************/

package org.eclipse.ui.navigator;

import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.ui.actions.ActionContext;
import org.eclipse.ui.internal.navigator.actions.CommonActionDescriptorManager;
import org.eclipse.ui.internal.navigator.actions.CommonActionProviderDescriptor;

/**
 * Used to access internal stuff from the CN implementation.
 * 
 * This is not API, it is used only for supporting the CN tests.
 * 
 * @noextend This class is not intended to be subclassed by clients.
 * @noinstantiate This class is not intended to be instantiated by clients.
 * @since 3.3 (not really, but this fools the API tooling checks).
 */
public class TestAccessHelper {

	
	/**
	 * @param contentService 
	 * @param actionService 
	 * @param cls 
	 * @return a CommonActionProvider
	 * @throws Exception 
	 * @noreference
	 * 
	 * @since 3.3 (not really, but this fools the API tooling checks)
	 */
	public static CommonActionProvider getActionProvider(
			INavigatorContentService contentService,
			NavigatorActionService actionService, Class cls) throws Exception {

		CommonActionProvider provider = null;
		CommonActionProviderDescriptor[] providerDescriptors = CommonActionDescriptorManager
				.getInstance().findRelevantActionDescriptors(contentService,
						new ActionContext(new StructuredSelection()));
		if (providerDescriptors.length > 0) {
			for (int i = 0; i < providerDescriptors.length; i++) {
				provider = actionService
						.getActionProviderInstance(providerDescriptors[i]);
				if (provider.getClass() == cls)
					return provider;
			}
		}
		return null;
	}

}

Added Link Here

(-).settings/.api_filters (+11 lines)
1	<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2	<component id="org.eclipse.ui.navigator" version="2">
3	<resource path="META-INF/MANIFEST.MF">
4	<filter id="924844039">
5	<message_arguments>
6	<message_argument value="3.3.101.qualifier"/>
7	<message_argument value="3.3.100.I20080606-1300"/>
8	</message_arguments>
9	</filter>
10	</resource>
11	</component>




import org.eclipse.ui.navigator.CommonNavigator;
import org.eclipse.ui.navigator.CommonViewer;
import org.eclipse.ui.navigator.INavigatorContentService;
import org.eclipse.ui.navigator.NavigatorActionService;
import org.eclipse.ui.tests.navigator.util.TestWorkspace;

public class NavigatorTestBase extends TestCase {

	public static final String COMMON_NAVIGATOR_TEST_EXT = "org.eclipse.ui.tests.navigator.testContent"; //$NON-NLS-1$

	protected String _navigatorInstanceId;

	protected Set expectedChildren = new HashSet();

	protected IProject project;

	protected CommonViewer viewer;

	protected CommonNavigator _commonNavigator;
	
	protected INavigatorContentService contentService;

	protected void setUp() throws Exception {

	protected INavigatorContentService contentService;
	protected NavigatorActionService _actionService;

	protected boolean _initTestData = true;

	protected void setUp() throws Exception {
		project = root.getProject("Test"); //$NON-NLS-1$

		if (_navigatorInstanceId == null) {
			throw new RuntimeException(
					"Set the _navigatorInstanceId in the constructor");
		}

		if (_initTestData) {

			TestWorkspace.init();

			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
			project = root.getProject("Test"); //$NON-NLS-1$

			expectedChildren.add(project.getFolder("src")); //$NON-NLS-1$
			expectedChildren.add(project.getFolder("bin")); //$NON-NLS-1$
			expectedChildren.add(project.getFile(".project")); //$NON-NLS-1$
			expectedChildren.add(project.getFile(".classpath")); //$NON-NLS-1$ 
			expectedChildren.add(project.getFile("model.properties")); //$NON-NLS-1$
		}

		EditorTestHelper.showView(_navigatorInstanceId, true);

		IWorkbenchWindow activeWindow = PlatformUI.getWorkbench()
				.getActiveWorkbenchWindow();
		IWorkbenchPage activePage = activeWindow.getActivePage();

		_commonNavigator = (CommonNavigator) activePage
				.findView(_navigatorInstanceId);
		_commonNavigator.setFocus();
		viewer = (CommonViewer) _commonNavigator.getAdapter(CommonViewer.class);

		contentService = viewer.getNavigatorContentService();
		_actionService = _commonNavigator.getNavigatorActionService();

		IUndoableOperation updateFilters = new UpdateActiveFiltersOperation(
				viewer, new String[0], true);
		updateFilters.execute(null, null);
	}

	protected void tearDown() throws Exception {
		IProject[] projects = ResourcesPlugin.getWorkspace().getRoot()
				.getProjects();
		for (int i = 0; i < projects.length; i++) {
			projects[i].delete(true, null);
		}
	}

}

Lines 26-31 Link Here

(-)src/org/eclipse/ui/tests/navigator/NavigatorTestSuite.java (+1 lines)
26	* Construct the test suite.	26	* Construct the test suite.
27	*/	27	*/
28	public NavigatorTestSuite() {	28	public NavigatorTestSuite() {
		29	addTest(new TestSuite(WorkingSetTest.class));
29	addTest(new TestSuite(ActivityTest.class));	30	addTest(new TestSuite(ActivityTest.class));
30	addTest(new TestSuite(OpenTest.class));	31	addTest(new TestSuite(OpenTest.class));
31	addTest(new TestSuite(INavigatorContentServiceTests.class));	32	addTest(new TestSuite(INavigatorContentServiceTests.class));





import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.swt.widgets.TreeItem;
import org.eclipse.ui.navigator.resources.ProjectExplorer;

public class OpenTest extends NavigatorTestBase {

	public OpenTest()
	{
		_navigatorInstanceId = ProjectExplorer.VIEW_ID;
	}
	
	public void testNavigatorRootContents() throws Exception {




import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.actions.ActionContext;
import org.eclipse.ui.activities.IWorkbenchActivitySupport;
import org.eclipse.ui.navigator.resources.ProjectExplorer;

public class ActivityTest extends NavigatorTestBase {

	public ActivityTest() {
		_navigatorInstanceId = ProjectExplorer.VIEW_ID;
	}

	protected NavigatorActionService _actionService;

	protected static final String ACTIVITY = "org.eclipse.ui.tests.navigator.testActivity";

	protected boolean verifyMenu(IStructuredSelection sel, String item) {


		IStructuredSelection sel = new StructuredSelection(project);
		viewer.setSelection(sel);
		_actionService = _commonNavigator.getNavigatorActionService();

		IWorkbenchActivitySupport actSupport = PlatformUI.getWorkbench().getActivitySupport();


Lines 15-18 Link Here

(-)META-INF/MANIFEST.MF (+1 lines)
15	org.eclipse.ui.navigator.resources	15	org.eclipse.ui.navigator.resources
16	Bundle-Vendor: Eclipse.org	16	Bundle-Vendor: Eclipse.org
17	Bundle-ClassPath: uinavtests.jar	17	Bundle-ClassPath: uinavtests.jar
		18	Bundle-RequiredExecutionEnvironment: J2SE-1.4
18	Bundle-ActivationPolicy: lazy	19	Bundle-ActivationPolicy: lazy




#Sat Aug 16 12:54:53 PDT 2008
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4

org.eclipse.jdt.core.compiler.problem.deprecation=warning
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
org.eclipse.jdt.core.compiler.problem.forbiddenReference=ignore
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore

org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled

org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
org.eclipse.jdt.core.compiler.problem.unusedImport=error
org.eclipse.jdt.core.compiler.problem.unusedLabel=error
org.eclipse.jdt.core.compiler.problem.unusedLocal=error
org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.4




/*******************************************************************************
 * Copyright (c) 2008 Oakland Software Incorporated 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:
 *     Oakland Software Incorporated - initial API and implementation
 *******************************************************************************/
package org.eclipse.ui.tests.navigator;

import java.io.ByteArrayInputStream;

import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.TreeItem;
import org.eclipse.ui.IWorkingSet;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.actions.WorkingSetFilterActionGroup;
import org.eclipse.ui.internal.AggregateWorkingSet;
import org.eclipse.ui.internal.WorkingSet;
import org.eclipse.ui.internal.navigator.resources.actions.WorkingSetActionProvider;
import org.eclipse.ui.navigator.TestAccessHelper;
import org.eclipse.ui.navigator.resources.ProjectExplorer;
import org.eclipse.ui.tests.navigator.util.TestWorkspace;

public class WorkingSetTest extends NavigatorTestBase {

	public WorkingSetTest() {
		_navigatorInstanceId = ProjectExplorer.VIEW_ID;
		_initTestData = false;
	}

	// Bug 157877 when using empty window working set, it should show all
	public void testEmptyWindowWorkingSet() throws Exception {
		TestWorkspace.init();

		WorkingSetActionProvider provider = (WorkingSetActionProvider) TestAccessHelper
				.getActionProvider(contentService, _actionService,
						WorkingSetActionProvider.class);

		IWorkingSet workingSet = PlatformUI.getWorkbench()
				.getActiveWorkbenchWindow().getActivePage()
				.getAggregateWorkingSet();

		// Set the filter to window working set (which should be empty)
		IPropertyChangeListener l = provider.getFilterChangeListener();
		PropertyChangeEvent event = new PropertyChangeEvent(this,
				WorkingSetFilterActionGroup.CHANGE_WORKING_SET, null,
				workingSet);
		l.propertyChange(event);

		TreeItem[] items = viewer.getTree().getItems();
		assertTrue("There should be some items.", items.length > 0);
	}

	// Bug 212389 projects are not shown when they are not in the working set,
	// but their children are
	public void testMissingProjectsInWorkingSet() throws Exception {

		IProject p1 = ResourcesPlugin.getWorkspace().getRoot().getProject("p1");
		p1.create(null);
		p1.open(null);
		IFile f1 = p1.getFile("f1");
		f1.create(new ByteArrayInputStream(new byte[] {}), true, null);

		WorkingSetActionProvider provider = (WorkingSetActionProvider) TestAccessHelper
				.getActionProvider(contentService, _actionService,
						WorkingSetActionProvider.class);

		IWorkingSet workingSet = new WorkingSet("ws1", "ws1",
				new IAdaptable[] { f1 });

		AggregateWorkingSet agWorkingSet = new AggregateWorkingSet("AgWs",
				"Ag Working Set", new IWorkingSet[] { workingSet });

		IPropertyChangeListener l = provider.getFilterChangeListener();
		PropertyChangeEvent event = new PropertyChangeEvent(this,
				WorkingSetFilterActionGroup.CHANGE_WORKING_SET, null,
				agWorkingSet);
		l.propertyChange(event);

		DisplayHelper.runEventLoop(Display.getCurrent(), 100);

		// DisplayHelper.sleep(Display.getCurrent(), 10000000);

		TreeItem[] items = viewer.getTree().getItems();
		// The bug is here where the first item is a IFile, not the enclosing
		// project
		assertTrue("First item needs to be project", items[0].getData().equals(
				p1));
	}

}

Return to bug 212389

Added Link Here

(-)src/org/eclipse/ui/navigator/TestAccessHelper.java (+60 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008 Oakland Software Incorporated 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	* Oakland Software Incorporated - initial API and implementation
10	******************************************************************************/
11
12	package org.eclipse.ui.navigator;
13
14	import org.eclipse.jface.viewers.StructuredSelection;
15	import org.eclipse.ui.actions.ActionContext;
16	import org.eclipse.ui.internal.navigator.actions.CommonActionDescriptorManager;
17	import org.eclipse.ui.internal.navigator.actions.CommonActionProviderDescriptor;
18
19	/**
20	* Used to access internal stuff from the CN implementation.
21	*
22	* This is not API, it is used only for supporting the CN tests.
23	*
24	* @noextend This class is not intended to be subclassed by clients.
25	* @noinstantiate This class is not intended to be instantiated by clients.
26	* @since 3.3 (not really, but this fools the API tooling checks).
27	*/
28	public class TestAccessHelper {
29
30
31	/**
32	* @param contentService
33	* @param actionService
34	* @param cls
35	* @return a CommonActionProvider
36	* @throws Exception
37	* @noreference
38	*
39	* @since 3.3 (not really, but this fools the API tooling checks)
40	*/
41	public static CommonActionProvider getActionProvider(
42	INavigatorContentService contentService,
43	NavigatorActionService actionService, Class cls) throws Exception {
44
45	CommonActionProvider provider = null;
46	CommonActionProviderDescriptor[] providerDescriptors = CommonActionDescriptorManager
47	.getInstance().findRelevantActionDescriptors(contentService,
48	new ActionContext(new StructuredSelection()));
49	if (providerDescriptors.length > 0) {
50	for (int i = 0; i < providerDescriptors.length; i++) {
51	provider = actionService
52	.getActionProviderInstance(providerDescriptors[i]);
53	if (provider.getClass() == cls)
54	return provider;
55	}
56	}
57	return null;
58	}
59
60	}

Lines 26-31 Link Here

(-)src/org/eclipse/ui/tests/navigator/NavigatorTestBase.java (-18 / +39 lines)
26	import org.eclipse.ui.navigator.CommonNavigator;	26	import org.eclipse.ui.navigator.CommonNavigator;
27	import org.eclipse.ui.navigator.CommonViewer;	27	import org.eclipse.ui.navigator.CommonViewer;
28	import org.eclipse.ui.navigator.INavigatorContentService;	28	import org.eclipse.ui.navigator.INavigatorContentService;
		29	import org.eclipse.ui.navigator.NavigatorActionService;
29	import org.eclipse.ui.tests.navigator.util.TestWorkspace;	30	import org.eclipse.ui.tests.navigator.util.TestWorkspace;
30		31
31	public class NavigatorTestBase extends TestCase {	32	public class NavigatorTestBase extends TestCase {
Lines 37-43 Link Here
37	public static final String COMMON_NAVIGATOR_TEST_EXT = "org.eclipse.ui.tests.navigator.testContent"; //$NON-NLS-1$	38	public static final String COMMON_NAVIGATOR_TEST_EXT = "org.eclipse.ui.tests.navigator.testContent"; //$NON-NLS-1$
38		39
39	protected String _navigatorInstanceId;	40	protected String _navigatorInstanceId;
40		41
41	protected Set expectedChildren = new HashSet();	42	protected Set expectedChildren = new HashSet();
42		43
43	protected IProject project;	44	protected IProject project;
Lines 45-82 Link Here
45	protected CommonViewer viewer;	46	protected CommonViewer viewer;
46		47
47	protected CommonNavigator _commonNavigator;	48	protected CommonNavigator _commonNavigator;
48
49	protected INavigatorContentService contentService;
50
51	protected void setUp() throws Exception {
52		49
53	if (_navigatorInstanceId == null)	50	protected INavigatorContentService contentService;
54	throw new RuntimeException("Set the _navigatorInstanceId in the constructor");	51	protected NavigatorActionService _actionService;
55		52
56	TestWorkspace.init();	53	protected boolean _initTestData = true;
57		54
58	IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();	55	protected void setUp() throws Exception {
59	project = root.getProject("Test"); //$NON-NLS-1$
60		56
61	expectedChildren.add(project.getFolder("src")); //$NON-NLS-1$	57	if (_navigatorInstanceId == null) {
62	expectedChildren.add(project.getFolder("bin")); //$NON-NLS-1$	58	throw new RuntimeException(
63	expectedChildren.add(project.getFile(".project")); //$NON-NLS-1$	59	"Set the _navigatorInstanceId in the constructor");
64	expectedChildren.add(project.getFile(".classpath")); //$NON-NLS-1$	60	}
65	expectedChildren.add(project.getFile("model.properties")); //$NON-NLS-1$	61
		62	if (_initTestData) {
		63
		64	TestWorkspace.init();
		65
		66	IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
		67	project = root.getProject("Test"); //$NON-NLS-1$
		68
		69	expectedChildren.add(project.getFolder("src")); //$NON-NLS-1$
		70	expectedChildren.add(project.getFolder("bin")); //$NON-NLS-1$
		71	expectedChildren.add(project.getFile(".project")); //$NON-NLS-1$
		72	expectedChildren.add(project.getFile(".classpath")); //$NON-NLS-1$
		73	expectedChildren.add(project.getFile("model.properties")); //$NON-NLS-1$
		74	}
66		75
67	EditorTestHelper.showView(_navigatorInstanceId, true);	76	EditorTestHelper.showView(_navigatorInstanceId, true);
68		77
69	IWorkbenchWindow activeWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();	78	IWorkbenchWindow activeWindow = PlatformUI.getWorkbench()
		79	.getActiveWorkbenchWindow();
70	IWorkbenchPage activePage = activeWindow.getActivePage();	80	IWorkbenchPage activePage = activeWindow.getActivePage();
71		81
72	_commonNavigator = (CommonNavigator) activePage.findView(_navigatorInstanceId);	82	_commonNavigator = (CommonNavigator) activePage
		83	.findView(_navigatorInstanceId);
73	_commonNavigator.setFocus();	84	_commonNavigator.setFocus();
74	viewer = (CommonViewer) _commonNavigator.getAdapter(CommonViewer.class);	85	viewer = (CommonViewer) _commonNavigator.getAdapter(CommonViewer.class);
75		86
76	contentService = viewer.getNavigatorContentService();	87	contentService = viewer.getNavigatorContentService();
		88	_actionService = _commonNavigator.getNavigatorActionService();
77		89
78	IUndoableOperation updateFilters = new UpdateActiveFiltersOperation(viewer, new String[0], true);	90	IUndoableOperation updateFilters = new UpdateActiveFiltersOperation(
		91	viewer, new String[0], true);
79	updateFilters.execute(null, null);	92	updateFilters.execute(null, null);
80	}	93	}
81		94
		95	protected void tearDown() throws Exception {
		96	IProject[] projects = ResourcesPlugin.getWorkspace().getRoot()
		97	.getProjects();
		98	for (int i = 0; i < projects.length; i++) {
		99	projects[i].delete(true, null);
		100	}
		101	}
		102
82	}	103	}

Lines 12-23 Link Here

(-)src/org/eclipse/ui/tests/navigator/OpenTest.java (-1 / +2 lines)
12		12
13	import org.eclipse.jface.viewers.StructuredSelection;	13	import org.eclipse.jface.viewers.StructuredSelection;
14	import org.eclipse.swt.widgets.TreeItem;	14	import org.eclipse.swt.widgets.TreeItem;
		15	import org.eclipse.ui.navigator.resources.ProjectExplorer;
15		16
16	public class OpenTest extends NavigatorTestBase {	17	public class OpenTest extends NavigatorTestBase {
17		18
18	public OpenTest()	19	public OpenTest()
19	{	20	{
20	_navigatorInstanceId = "org.eclipse.ui.navigator.ProjectExplorer";	21	_navigatorInstanceId = ProjectExplorer.VIEW_ID;
21	}	22	}
22		23
23	public void testNavigatorRootContents() throws Exception {	24	public void testNavigatorRootContents() throws Exception {

Lines 21-36 Link Here

(-)src/org/eclipse/ui/tests/navigator/ActivityTest.java (-5 / +2 lines)
21	import org.eclipse.ui.PlatformUI;	21	import org.eclipse.ui.PlatformUI;
22	import org.eclipse.ui.actions.ActionContext;	22	import org.eclipse.ui.actions.ActionContext;
23	import org.eclipse.ui.activities.IWorkbenchActivitySupport;	23	import org.eclipse.ui.activities.IWorkbenchActivitySupport;
24	import org.eclipse.ui.navigator.NavigatorActionService;	24	import org.eclipse.ui.navigator.resources.ProjectExplorer;
25		25
26	public class ActivityTest extends NavigatorTestBase {	26	public class ActivityTest extends NavigatorTestBase {
27		27
28	public ActivityTest() {	28	public ActivityTest() {
29	_navigatorInstanceId = "org.eclipse.ui.navigator.ProjectExplorer";	29	_navigatorInstanceId = ProjectExplorer.VIEW_ID;
30	}	30	}
31		31
32	protected NavigatorActionService _actionService;
33
34	protected static final String ACTIVITY = "org.eclipse.ui.tests.navigator.testActivity";	32	protected static final String ACTIVITY = "org.eclipse.ui.tests.navigator.testActivity";
35		33
36	protected boolean verifyMenu(IStructuredSelection sel, String item) {	34	protected boolean verifyMenu(IStructuredSelection sel, String item) {
Lines 62-68 Link Here
62		60
63	IStructuredSelection sel = new StructuredSelection(project);	61	IStructuredSelection sel = new StructuredSelection(project);
64	viewer.setSelection(sel);	62	viewer.setSelection(sel);
65	_actionService = _commonNavigator.getNavigatorActionService();
66		63
67	IWorkbenchActivitySupport actSupport = PlatformUI.getWorkbench().getActivitySupport();	64	IWorkbenchActivitySupport actSupport = PlatformUI.getWorkbench().getActivitySupport();
68		65

Lines 1-4 Link Here

(-).settings/org.eclipse.jdt.core.prefs (-3 / +11 lines)
1	#Thu Sep 14 08:14:32 EDT 2006	1	#Sat Aug 16 12:54:53 PDT 2008
2	eclipse.preferences.version=1	2	eclipse.preferences.version=1
3	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled	3	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
4	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4	4	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
Lines 13-26 Link Here
13	org.eclipse.jdt.core.compiler.problem.deprecation=warning	13	org.eclipse.jdt.core.compiler.problem.deprecation=warning
14	org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled	14	org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
15	org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled	15	org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
16	org.eclipse.jdt.core.compiler.problem.discouragedReference=warning	16	org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
17	org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore	17	org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
18	org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning	18	org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
19	org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore	19	org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
		20	org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
20	org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore	21	org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
21	org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning	22	org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
22	org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning	23	org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
23	org.eclipse.jdt.core.compiler.problem.forbiddenReference=error	24	org.eclipse.jdt.core.compiler.problem.forbiddenReference=ignore
24	org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning	25	org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
25	org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning	26	org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
26	org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore	27	org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
Lines 37-43 Link Here
37	org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning	38	org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
38	org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore	39	org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
39	org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore	40	org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
		41	org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
40	org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore	42	org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
		43	org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
		44	org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
41	org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled	45	org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
42	org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning	46	org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
43	org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled	47	org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
Lines 50-62 Link Here
50	org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore	54	org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
51	org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore	55	org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
52	org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore	56	org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
		57	org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
		58	org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
53	org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled	59	org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
54	org.eclipse.jdt.core.compiler.problem.unusedImport=error	60	org.eclipse.jdt.core.compiler.problem.unusedImport=error
55	org.eclipse.jdt.core.compiler.problem.unusedLabel=error	61	org.eclipse.jdt.core.compiler.problem.unusedLabel=error
56	org.eclipse.jdt.core.compiler.problem.unusedLocal=error	62	org.eclipse.jdt.core.compiler.problem.unusedLocal=error
57	org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore	63	org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
		64	org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
58	org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled	65	org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
59	org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled	66	org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
60	org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning	67	org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
		68	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
61	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning	69	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
62	org.eclipse.jdt.core.compiler.source=1.4	70	org.eclipse.jdt.core.compiler.source=1.4

Added Link Here

(-)src/org/eclipse/ui/tests/navigator/WorkingSetTest.java (+100 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008 Oakland Software Incorporated 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	* Oakland Software Incorporated - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.ui.tests.navigator;
12
13	import java.io.ByteArrayInputStream;
14
15	import org.eclipse.core.resources.IFile;
16	import org.eclipse.core.resources.IProject;
17	import org.eclipse.core.resources.ResourcesPlugin;
18	import org.eclipse.core.runtime.IAdaptable;
19	import org.eclipse.jface.util.IPropertyChangeListener;
20	import org.eclipse.jface.util.PropertyChangeEvent;
21	import org.eclipse.swt.widgets.Display;
22	import org.eclipse.swt.widgets.TreeItem;
23	import org.eclipse.ui.IWorkingSet;
24	import org.eclipse.ui.PlatformUI;
25	import org.eclipse.ui.actions.WorkingSetFilterActionGroup;
26	import org.eclipse.ui.internal.AggregateWorkingSet;
27	import org.eclipse.ui.internal.WorkingSet;
28	import org.eclipse.ui.internal.navigator.resources.actions.WorkingSetActionProvider;
29	import org.eclipse.ui.navigator.TestAccessHelper;
30	import org.eclipse.ui.navigator.resources.ProjectExplorer;
31	import org.eclipse.ui.tests.navigator.util.TestWorkspace;
32
33	public class WorkingSetTest extends NavigatorTestBase {
34
35	public WorkingSetTest() {
36	_navigatorInstanceId = ProjectExplorer.VIEW_ID;
37	_initTestData = false;
38	}
39
40	// Bug 157877 when using empty window working set, it should show all
41	public void testEmptyWindowWorkingSet() throws Exception {
42	TestWorkspace.init();
43
44	WorkingSetActionProvider provider = (WorkingSetActionProvider) TestAccessHelper
45	.getActionProvider(contentService, _actionService,
46	WorkingSetActionProvider.class);
47
48	IWorkingSet workingSet = PlatformUI.getWorkbench()
49	.getActiveWorkbenchWindow().getActivePage()
50	.getAggregateWorkingSet();
51
52	// Set the filter to window working set (which should be empty)
53	IPropertyChangeListener l = provider.getFilterChangeListener();
54	PropertyChangeEvent event = new PropertyChangeEvent(this,
55	WorkingSetFilterActionGroup.CHANGE_WORKING_SET, null,
56	workingSet);
57	l.propertyChange(event);
58
59	TreeItem[] items = viewer.getTree().getItems();
60	assertTrue("There should be some items.", items.length > 0);
61	}
62
63	// Bug 212389 projects are not shown when they are not in the working set,
64	// but their children are
65	public void testMissingProjectsInWorkingSet() throws Exception {
66
67	IProject p1 = ResourcesPlugin.getWorkspace().getRoot().getProject("p1");
68	p1.create(null);
69	p1.open(null);
70	IFile f1 = p1.getFile("f1");
71	f1.create(new ByteArrayInputStream(new byte[] {}), true, null);
72
73	WorkingSetActionProvider provider = (WorkingSetActionProvider) TestAccessHelper
74	.getActionProvider(contentService, _actionService,
75	WorkingSetActionProvider.class);
76
77	IWorkingSet workingSet = new WorkingSet("ws1", "ws1",
78	new IAdaptable[] { f1 });
79
80	AggregateWorkingSet agWorkingSet = new AggregateWorkingSet("AgWs",
81	"Ag Working Set", new IWorkingSet[] { workingSet });
82
83	IPropertyChangeListener l = provider.getFilterChangeListener();
84	PropertyChangeEvent event = new PropertyChangeEvent(this,
85	WorkingSetFilterActionGroup.CHANGE_WORKING_SET, null,
86	agWorkingSet);
87	l.propertyChange(event);
88
89	DisplayHelper.runEventLoop(Display.getCurrent(), 100);
90
91	// DisplayHelper.sleep(Display.getCurrent(), 10000000);
92
93	TreeItem[] items = viewer.getTree().getItems();
94	// The bug is here where the first item is a IFile, not the enclosing
95	// project
96	assertTrue("First item needs to be project", items[0].getData().equals(
97	p1));
98	}
99
100	}