Skip to content

Fix error with search in XMI-tab of E4WorkbenchModelEditor #2293

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
vogella merged 2 commits into from
Apr 19, 2026
+10 −10
Merged

Fix error with search in XMI-tab of E4WorkbenchModelEditor #2293

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
8b51aa5
Fix error with search in XMI-tab of E4WorkbenchModelEditor
r-mennig Apr 17, 2026
53a2832
Version bump(s) for 4.40 stream
eclipse-pde-bot Apr 19, 2026
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 e4tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
Bundle-Version: 4.9.0.qualifier
Bundle-Version: 4.9.100.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-21
Expand Down
2 changes: 1 addition & 1 deletion e4tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
<version>4.9.0-SNAPSHOT</version>
<version>4.9.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

<properties>
Expand Down
16 changes: 8 additions & 8 deletions ...4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@
import org.eclipse.jface.text.source.SourceViewer;
import org.eclipse.jface.text.source.VerticalRuler;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.KeyAdapter;
import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.events.KeyListener;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
Expand Down Expand Up @@ -88,14 +87,15 @@ protected void postConstruct() {
text = new Text(this, SWT.SINGLE | SWT.LEAD | SWT.BORDER);
text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
text.setMessage(Messages.XmiTab_TypeTextToSearch);
text.addKeyListener(new KeyAdapter() {
@Override
public void keyPressed(KeyEvent e) {
if (e.keyCode != SWT.CR) {
offsetStart = 0;
}
text.addKeyListener(KeyListener.keyPressedAdapter(e -> {
if (e.keyCode != SWT.CR) {
offsetStart = 0;
} else { // search next occurrence
offsetStart = searchAndHighlight(text.getText(), offsetStart);
}
}));
text.addModifyListener(e -> {
offsetStart = searchAndHighlight(text.getText(), offsetStart);
});

final AnnotationModel model = new AnnotationModel();
Expand Down
Loading