Skip to content

Restore ability to filter views by category #2579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 6, 2024
Merged

Restore ability to filter views by category #2579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fea67d9
Restore ability to filter views by category
ptziegler Dec 3, 2024
d5d2aa9
Version bump(s) for 4.35 stream
eclipse-platform-bot Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bundles/org.eclipse.e4.ui.workbench.swt/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.e4.ui.workbench.swt;singleton:=true
Bundle-Version: 0.17.600.qualifier
Bundle-Version: 0.17.700.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Expand Down
21 changes: 5 additions & 16 deletions ...ui.workbench.swt/src/org/eclipse/e4/ui/workbench/swt/internal/copy/ViewPatternFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2005, 2019 IBM Corporation and others.
* Copyright (c) 2005, 2024 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand All @@ -14,6 +14,7 @@
*******************************************************************************/
package org.eclipse.e4.ui.workbench.swt.internal.copy;

import java.util.stream.Stream;
import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.ui.dialogs.filteredtree.PatternFilter;
import org.eclipse.e4.ui.model.LocalizationHelper;
Expand Down Expand Up @@ -42,20 +43,8 @@ public boolean isElementSelectable(Object element) {

@Override
protected boolean isLeafMatch(Viewer viewer, Object element) {
if (element instanceof String) {
return false;
}

String text = null;
if (element instanceof MPartDescriptor) {
MPartDescriptor desc = (MPartDescriptor) element;
text = LocalizationHelper.getLocalized(desc.getLabel(), desc,
context);
if (wordMatches(text)) {
return true;
}
}

return false;
return element instanceof MPartDescriptor desc && Stream.of(desc.getLabel(), desc.getCategory()) //
.map(text -> LocalizationHelper.getLocalized(text, desc, context)) //
.anyMatch(this::wordMatches);
}
}
20 changes: 5 additions & 15 deletions ...org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/dialogs/ViewPatternFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2005, 2014 IBM Corporation and others.
* Copyright (c) 2005, 2024 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand All @@ -14,6 +14,7 @@
*******************************************************************************/
package org.eclipse.ui.internal.dialogs;

import java.util.stream.Stream;
import org.eclipse.e4.ui.model.LocalizationHelper;
import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
import org.eclipse.jface.viewers.Viewer;
Expand All @@ -34,19 +35,8 @@ public boolean isElementSelectable(Object element) {

@Override
protected boolean isLeafMatch(Viewer viewer, Object element) {
if (element instanceof String) {
return false;
}

String text = null;
if (element instanceof MPartDescriptor) {
MPartDescriptor desc = (MPartDescriptor) element;
text = LocalizationHelper.getLocalized(desc.getLabel(), desc);
if (wordMatches(text)) {
return true;
}
}

return false;
return element instanceof MPartDescriptor desc && Stream.of(desc.getLabel(), desc.getCategory()) //
.map(text -> LocalizationHelper.getLocalized(text, desc)) //
.anyMatch(this::wordMatches);
}
}
Loading