Filter to projects in action classes instead of anonymous overrides

Move the project-filtering logic from anonymous getSelectedResources()
overrides in ResourceMgmtActionProvider into the action classes
themselves (OpenResourceAction, CloseResourceAction,
CloseUnrelatedProjectsAction). This fixes the API analysis build
failure caused by illegally subclassing these action classes.

The updateSelection() methods now filter getSelectedResources() to
IProject instances, so mixed selections (e.g. Ctrl+A) correctly
enable/disable Open/Close Project actions. The resourceChanged()
methods also use stream-based project checks instead of
selectionIsOfType() to react properly to project state changes
during mixed selections.

Author: vogella

bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/CloseResourceAction.java

@@ -16,7 +16,6 @@
 package org.eclipse.ui.actions;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.core.resources.IFile;
@@ -229,15 +228,14 @@ protected boolean updateSelection(IStructuredSelection s) {
 		// don't call super since we want to enable if open project is selected.
 		setText(defaultText);
 		setToolTipText(defaultToolTip);
-		List<? extends IResource> selectedResources = getSelectedResources();
-		if (selectedResources.isEmpty() || selectedResources.stream().anyMatch(r -> !(r instanceof IProject))) {
+		List<IProject> projects = getSelectedResources().stream()
+				.filter(IProject.class::isInstance).map(IProject.class::cast).toList();
+		if (projects.isEmpty()) {
 			return false;
 		}
 
 		boolean hasOpenProjects = false;
-		Iterator<? extends IResource> resources = selectedResources.iterator();
-		while (resources.hasNext()) {
-			IProject currentResource = (IProject) resources.next();
+		for (IProject currentResource : projects) {
 			if (currentResource.isOpen()) {
 				if (hasOpenProjects) {
 					setText(pluralText);
@@ -259,7 +257,7 @@ public synchronized void resourceChanged(IResourceChangeEvent event) {
 		// Warning: code duplicated in OpenResourceAction
 		List<? extends IResource> sel = getSelectedResources();
 		// don't bother looking at delta if selection not applicable
-		if (selectionIsOfType(IResource.PROJECT)) {
+		if (sel.stream().anyMatch(IProject.class::isInstance)) {
 			IResourceDelta delta = event.getDelta();
 			if (delta != null) {
 				IResourceDelta[] projDeltas = delta.getAffectedChildren(IResourceDelta.CHANGED);

bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/CloseUnrelatedProjectsAction.java

@@ -262,7 +262,7 @@ protected List<? extends IResource> getSelectedResources() {
 	public void resourceChanged(IResourceChangeEvent event) {
 		// don't bother looking at delta if selection not applicable
 		List<? extends IResource> selectedResources = super.getSelectedResources();
-		if (!selectedResources.isEmpty() && selectedResources.stream().allMatch(r -> r instanceof IProject)) {
+		if (selectedResources.stream().anyMatch(IProject.class::isInstance)) {
 			IResourceDelta delta = event.getDelta();
 			if (delta != null) {
 				IResourceDelta[] projDeltas = delta.getAffectedChildren(IResourceDelta.CHANGED);

bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/OpenResourceAction.java

@@ -190,7 +190,7 @@ public void resourceChanged(IResourceChangeEvent event) {
 		// Warning: code duplicated in CloseResourceAction
 		List<? extends IResource> sel = getSelectedResources();
 		// don't bother looking at delta if selection not applicable
-		if (selectionIsOfType(IResource.PROJECT)) {
+		if (sel.stream().anyMatch(IProject.class::isInstance)) {
 			IResourceDelta delta = event.getDelta();
 			if (delta != null) {
 				IResourceDelta[] projDeltas = delta.getAffectedChildren(IResourceDelta.CHANGED);
@@ -304,14 +304,15 @@ protected boolean updateSelection(IStructuredSelection s) {
 		// selected.
 		setText(IDEWorkbenchMessages.OpenResourceAction_text);
 		setToolTipText(IDEWorkbenchMessages.OpenResourceAction_toolTip);
-		List<? extends IResource> selectedResources = getSelectedResources();
-		if (selectedResources.isEmpty() || selectedResources.stream().anyMatch(r -> !(r instanceof IProject))) {
+		List<IProject> projects = getSelectedResources().stream()
+				.filter(IProject.class::isInstance).map(IProject.class::cast).toList();
+		if (projects.isEmpty()) {
 			return false;
 		}
 
 		boolean hasClosedProjects = false;
-		for (IResource currentResource : selectedResources) {
-			if (!((IProject) currentResource).isOpen()) {
+		for (IProject currentResource : projects) {
+			if (!currentResource.isOpen()) {
 				if (hasClosedProjects) {
 					setText(IDEWorkbenchMessages.OpenResourceAction_text_plural);
 					setToolTipText(IDEWorkbenchMessages.OpenResourceAction_toolTip_plural);

bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/ResourceMgmtActionProvider.java

@@ -22,7 +22,6 @@
 
 import org.eclipse.core.resources.ICommand;
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IncrementalProjectBuilder;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.resources.WorkspaceJob;
@@ -208,29 +207,11 @@ boolean hasBuilder(IProject project) {
 	protected void makeActions() {
 		IShellProvider sp = () -> shell;
 
-		openProjectAction = new OpenResourceAction(sp) {
-			@Override
-			protected synchronized List<? extends IResource> getSelectedResources() {
-				return super.getSelectedResources().stream()
-						.filter(IProject.class::isInstance).toList();
-			}
-		};
+		openProjectAction = new OpenResourceAction(sp);
 
-		closeProjectAction = new CloseResourceAction(sp) {
-			@Override
-			protected synchronized List<? extends IResource> getSelectedResources() {
-				return super.getSelectedResources().stream()
-						.filter(IProject.class::isInstance).toList();
-			}
-		};
+		closeProjectAction = new CloseResourceAction(sp);
 
-		closeUnrelatedProjectsAction = new CloseUnrelatedProjectsAction(sp) {
-			@Override
-			protected List<? extends IResource> getSelectedResources() {
-				return super.getSelectedResources().stream()
-						.filter(IProject.class::isInstance).toList();
-			}
-		};
+		closeUnrelatedProjectsAction = new CloseUnrelatedProjectsAction(sp);
 
 		refreshAction = new RefreshAction(sp) {
 			@Override