Bug 521342 - Lambda conversion in eclipse.platform.ui.tools repo
Change-Id: I136fe630a6ba7c019ea4e2ccd39793b69c523296
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java
index 5468385..5e415c8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2017 TwelveTone LLC 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
@@ -14,6 +14,7 @@
import java.util.Arrays;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
+
import org.eclipse.jface.fieldassist.ComboContentAdapter;
import org.eclipse.jface.fieldassist.ContentProposalAdapter;
import org.eclipse.jface.fieldassist.IContentProposal;
@@ -88,18 +89,11 @@
// need to delay the call
// THIS IS A WORKAROUND
final ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(1);
- executor.schedule(new Runnable() {
- @Override
- public void run() {
- dropDown.getCombo().getDisplay().syncExec(new Runnable() {
-
- @Override
- public void run() {
- dropDown.getCombo().setSelection(new Point(0, dropDown.getCombo().getText().length()));
- }
- });
- }
- }, 200, TimeUnit.MILLISECONDS);
+ executor.schedule(
+ () -> dropDown.getCombo().getDisplay()
+ .syncExec(() -> dropDown.getCombo()
+ .setSelection(new Point(0, dropDown.getCombo().getText().length()))),
+ 200, TimeUnit.MILLISECONDS);
}
});
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
index 17cece3..ba53057 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014, 2015 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2017 TwelveTone LLC 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
@@ -20,12 +20,8 @@
import org.eclipse.jface.viewers.ComboViewer;
import org.eclipse.jface.viewers.IContentProvider;
import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.IOpenListener;
import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.OpenEvent;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.swt.SWT;
@@ -117,13 +113,7 @@
toolBar.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
toolBar.setFont(group.getFont());
- picker.addOpenListener(new IOpenListener() {
-
- @Override
- public void open(OpenEvent event) {
- addPressed();
- }
- });
+ picker.addOpenListener(event -> addPressed());
tiAdd = new Button(toolBar, SWT.PUSH);
tiAdd.setToolTipText(messages.ModelTooling_Common_AddEllipsis);
@@ -177,13 +167,7 @@
final GridData gd = new GridData(GridData.FILL, GridData.FILL, true, true, 1, 1);
viewer.getControl().setLayoutData(gd);
- viewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
- @Override
- public void selectionChanged(SelectionChangedEvent event) {
- updateUiState();
- }
- });
+ viewer.addSelectionChangedListener(event -> updateUiState());
updateUiState();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java
index 018080f..2faeccd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java
@@ -3,8 +3,6 @@
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Shell;
public class ControlHighlighter {
@@ -21,13 +19,7 @@
s.setBackground(s.getDisplay().getSystemColor(SWT.COLOR_RED));
s.setAlpha(100);
s.open();
- s.addListener(SWT.MouseDown, new Listener() {
-
- @Override
- public void handleEvent(Event event) {
- hide();
- }
- });
+ s.addListener(SWT.MouseDown, event -> hide());
}
public static void hide() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
index dbcb180..7a43417 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2017 TwelveTone LLC 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
@@ -31,8 +31,6 @@
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.FocusAdapter;
import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
@@ -89,13 +87,7 @@
getList().setContentProvider(new ObservableListContentProvider());
- text.addModifyListener(new ModifyListener() {
-
- @Override
- public void modifyText(ModifyEvent e) {
- updateUiState();
- }
- });
+ text.addModifyListener(e -> updateUiState());
text.addFocusListener(new FocusAdapter() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index db5393e..340a9fe 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2014 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at 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
@@ -43,8 +43,6 @@
import org.eclipse.swt.custom.CTabFolder;
import org.eclipse.swt.custom.CTabItem;
import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Image;
@@ -183,21 +181,17 @@
final Text t = new Text(parent, SWT.BORDER);
TextPasteHandler.createFor(t);
t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- t.addModifyListener(new ModifyListener() {
-
- @Override
- public void modifyText(ModifyEvent e) {
- if (lnk != null) {
- lnk.setToolTipText(((Text) e.getSource()).getText());
- }
+ t.addModifyListener(e -> {
+ if (lnk != null) {
+ lnk.setToolTipText(((Text) e.getSource()).getText());
}
});
final Binding binding = context.bindValue(
textProp.observeDelayed(200, t),
EMFEditProperties.value(getEditingDomain(),
ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()),
- new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
- new UpdateValueStrategy());
+ new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
+ new UpdateValueStrategy());
Util.addDecoration(t, binding);
final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index a941043..33844ac 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2015 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at 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
@@ -60,9 +60,7 @@
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.ComboViewer;
import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.StyledCellLabelProvider;
import org.eclipse.jface.viewers.StyledString;
@@ -75,8 +73,6 @@
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CTabFolder;
import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
@@ -505,13 +501,7 @@
nameField = new Text(group, SWT.BORDER);
nameField.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
- nameField.addModifyListener(new ModifyListener() {
-
- @Override
- public void modifyText(ModifyEvent e) {
- setPageComplete(nameField.getText().trim().length() > 0);
- }
- });
+ nameField.addModifyListener(e -> setPageComplete(nameField.getText().trim().length() > 0));
}
{
@@ -560,13 +550,9 @@
keyField = new Text(group, SWT.BORDER);
keyField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- keyField.addModifyListener(new ModifyListener() {
-
- @Override
- public void modifyText(ModifyEvent e) {
- bindtableViewer.getControl().setEnabled(isPageComplete());
- setPageComplete(isPageComplete());
- }
+ keyField.addModifyListener(e -> {
+ bindtableViewer.getControl().setEnabled(isPageComplete());
+ setPageComplete(isPageComplete());
});
}
@@ -583,13 +569,7 @@
new ComponentLabelProvider(getEditor(), Messages, italicFontDescriptor)));
bindtableViewer.setContentProvider(new ArrayContentProvider());
bindtableViewer.setInput(application.getBindingTables());
- bindtableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
- @Override
- public void selectionChanged(SelectionChangedEvent event) {
- setPageComplete(isPageComplete());
- }
- });
+ bindtableViewer.addSelectionChangedListener(event -> setPageComplete(isPageComplete()));
bindtableViewer.setSelection(new StructuredSelection(application.getBindingTables().get(0)));
final GridData gd = new GridData(GridData.FILL_BOTH);
gd.heightHint = bindtableViewer.getTable().getItemHeight() * 5;
@@ -674,13 +654,7 @@
}
}
menuViewer.setInput(menuList);
- menuViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
- @Override
- public void selectionChanged(SelectionChangedEvent event) {
- setPageComplete(isPageComplete());
- }
- });
+ menuViewer.addSelectionChangedListener(event -> setPageComplete(isPageComplete()));
final GridData gd = new GridData(GridData.FILL_BOTH);
gd.heightHint = menuViewer.getTable().getItemHeight() * 5;
menuViewer.getControl().setLayoutData(gd);
@@ -764,13 +738,7 @@
}
}
toolbarViewer.setInput(toolbarList);
- toolbarViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
- @Override
- public void selectionChanged(SelectionChangedEvent event) {
- setPageComplete(isPageComplete());
- }
- });
+ toolbarViewer.addSelectionChangedListener(event -> setPageComplete(isPageComplete()));
final GridData gd = new GridData(GridData.FILL_BOTH);
gd.heightHint = toolbarViewer.getTable().getItemHeight() * 5;
toolbarViewer.getControl().setLayoutData(gd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
index abdd78a..73183d4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2013, 2014 MEDEVIT, FHV and others.
+ * Copyright (c) 2013, 2017 MEDEVIT, FHV 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
@@ -43,8 +43,6 @@
import org.eclipse.swt.custom.CTabFolder;
import org.eclipse.swt.custom.CTabItem;
import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Image;
@@ -182,21 +180,17 @@
final Text t = new Text(parent, SWT.BORDER);
TextPasteHandler.createFor(t);
t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- t.addModifyListener(new ModifyListener() {
-
- @Override
- public void modifyText(ModifyEvent e) {
- if (lnk != null) {
- lnk.setToolTipText(((Text) e.getSource()).getText());
- }
+ t.addModifyListener(e -> {
+ if (lnk != null) {
+ lnk.setToolTipText(((Text) e.getSource()).getText());
}
});
final Binding binding = context.bindValue(
textProp.observeDelayed(200, t),
EMFEditProperties.value(getEditingDomain(),
ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()),
- new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
- new UpdateValueStrategy());
+ new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
+ new UpdateValueStrategy());
Util.addDecoration(t, binding);
final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index ab936ee..b0b2a74 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2014 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at 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
@@ -47,8 +47,6 @@
import org.eclipse.swt.custom.CTabFolder;
import org.eclipse.swt.custom.CTabItem;
import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Image;
@@ -201,13 +199,9 @@
final Text t = new Text(parent, SWT.BORDER);
TextPasteHandler.createFor(t);
t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- t.addModifyListener(new ModifyListener() {
-
- @Override
- public void modifyText(ModifyEvent e) {
- if (lnk != null) {
- lnk.setToolTipText(((Text) e.getSource()).getText());
- }
+ t.addModifyListener(e -> {
+ if (lnk != null) {
+ lnk.setToolTipText(((Text) e.getSource()).getText());
}
});
final Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()), new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java
index 90406f4..d3e2130 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016 vogella GmbH and others.
+ * Copyright (c) 2016, 2017 vogella GmbH 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
@@ -36,8 +36,6 @@
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CTabFolder;
import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Image;
@@ -141,13 +139,9 @@
final Text t = new Text(parent, SWT.BORDER);
TextPasteHandler.createFor(t);
t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- t.addModifyListener(new ModifyListener() {
-
- @Override
- public void modifyText(ModifyEvent e) {
- if (lnk != null) {
- lnk.setToolTipText(((Text) e.getSource()).getText());
- }
+ t.addModifyListener(e -> {
+ if (lnk != null) {
+ lnk.setToolTipText(((Text) e.getSource()).getText());
}
});
final Binding binding = context.bindValue(textProp.observeDelayed(200, t),
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
index c445823..ba4c588 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at 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
@@ -27,8 +27,6 @@
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.jface.viewers.AbstractTreeViewer;
import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StyledCellLabelProvider;
@@ -37,8 +35,6 @@
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerCell;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
@@ -73,15 +69,9 @@
setMessage(getDialogMessage());
final Image titleImage = new Image(composite.getDisplay(), getClass().getClassLoader().getResourceAsStream(
- "/icons/full/wizban/newexp_wiz.png")); //$NON-NLS-1$
+ "/icons/full/wizban/newexp_wiz.png")); //$NON-NLS-1$
setTitleImage(titleImage);
- getShell().addDisposeListener(new DisposeListener() {
-
- @Override
- public void widgetDisposed(DisposeEvent e) {
- titleImage.dispose();
- }
- });
+ getShell().addDisposeListener(e -> titleImage.dispose());
final Composite container = new Composite(composite, SWT.NONE);
container.setLayoutData(new GridData(GridData.FILL_BOTH));
@@ -98,13 +88,7 @@
viewer.setContentProvider(new ArrayContentProvider());
viewer.setLabelProvider(new LabelProviderImpl());
viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
- viewer.addDoubleClickListener(new IDoubleClickListener() {
-
- @Override
- public void doubleClick(DoubleClickEvent event) {
- okPressed();
- }
- });
+ viewer.addDoubleClickListener(event -> okPressed());
final List<EObject> commands = new ArrayList<>();
final TreeIterator<EObject> it = EcoreUtil.getAllContents((EObject) resource.getRoot().get(0), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
index 5e014d0..8d5e9d5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
@@ -30,7 +30,6 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceVisitor;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.tools.emf.ui.common.ResourceSearchScope;
@@ -38,16 +37,12 @@
import org.eclipse.e4.tools.emf.ui.internal.StringMatcher;
import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StyledCellLabelProvider;
import org.eclipse.jface.viewers.StyledString;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.ViewerCell;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
@@ -190,13 +185,7 @@
final WritableList list = new WritableList();
viewer.setInput(list);
- viewer.addDoubleClickListener(new IDoubleClickListener() {
-
- @Override
- public void doubleClick(DoubleClickEvent event) {
- okPressed();
- }
- });
+ viewer.addDoubleClickListener(event -> okPressed());
textSearch.addModifyListener(new ModifyListener() {
private IconMatchCallback callback;
@@ -221,13 +210,7 @@
}
});
- getShell().addDisposeListener(new DisposeListener() {
-
- @Override
- public void widgetDisposed(DisposeEvent e) {
- clearImages();
- }
- });
+ getShell().addDisposeListener(e -> clearImages());
textSearch.notifyListeners(SWT.Modify, new Event());
@@ -301,13 +284,7 @@
public void match(final IFile file) {
if (!cancel) {
- list.getRealm().exec(new Runnable() {
-
- @Override
- public void run() {
- list.add(file);
- }
- });
+ list.getRealm().exec(() -> list.add(file));
}
}
}
@@ -366,25 +343,20 @@
e.printStackTrace();
}
}
- project.accept(new IResourceVisitor() {
-
- @Override
- public boolean visit(IResource resource) throws CoreException {
- if (callback.cancel) {
- return false;
- }
-
- if (resource.getType() == IResource.FOLDER || resource.getType() == IResource.PROJECT) {
- return true;
- } else if (resource.getType() == IResource.FILE && !resource.isLinked()) {
- String path = resource.getProjectRelativePath().toString();
- if (matcherGif.match(path) || matcherPng.match(path) || matcherJpg.match(path)) {
- callback.match((IFile) resource);
- }
- }
+ project.accept(resource -> {
+ if (callback.cancel) {
return false;
}
+ if (resource.getType() == IResource.FOLDER || resource.getType() == IResource.PROJECT) {
+ return true;
+ } else if (resource.getType() == IResource.FILE && !resource.isLinked()) {
+ String path = resource.getProjectRelativePath().toString();
+ if (matcherGif.match(path) || matcherPng.match(path) || matcherJpg.match(path)) {
+ callback.match((IFile) resource);
+ }
+ }
+ return false;
});
}
} catch (CoreException e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
index 85409e3..47d89b4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
@@ -26,7 +26,6 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceVisitor;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionData;
@@ -38,24 +37,18 @@
import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.TargetPlatformIconContributionCollector;
import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.StyledCellLabelProvider;
import org.eclipse.jface.viewers.StyledString;
import org.eclipse.jface.viewers.TableViewerColumn;
import org.eclipse.jface.viewers.ViewerCell;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Shell;
/**
@@ -127,16 +120,12 @@
maxDisplayedImageSize = 30;
cv.setSelection(new StructuredSelection(maxDisplayedImageSize));
- cv.addSelectionChangedListener(new ISelectionChangedListener() {
-
- @Override
- public void selectionChanged(SelectionChangedEvent event) {
- maxDisplayedImageSize = (Integer) ((IStructuredSelection) cv.getSelection()).getFirstElement();
- rebuildViewer();
- refreshSearch();
- // combo viewer cannot make rows smaller, so we will need to
- // rebuild it in that case.
- }
+ cv.addSelectionChangedListener(event -> {
+ maxDisplayedImageSize = (Integer) ((IStructuredSelection) cv.getSelection()).getFirstElement();
+ rebuildViewer();
+ refreshSearch();
+ // combo viewer cannot make rows smaller, so we will need to
+ // rebuild it in that case.
});
}
@@ -153,13 +142,7 @@
colText.getColumn().setText(Messages.AbstractIconDialogWithScopeAndFilter_details);
// resize the row height using a MeasureItem listener
- getViewer().getTable().addListener(SWT.MeasureItem, new Listener() {
- @Override
- public void handleEvent(Event event) {
- // height cannot be per row so simply set
- event.height = maxDisplayedImageSize;
- }
- });
+ getViewer().getTable().addListener(SWT.MeasureItem, event -> event.height = maxDisplayedImageSize);
colIcon.setLabelProvider(new StyledCellLabelProvider() {
@Override
@@ -251,13 +234,7 @@
});
colText.getColumn().setWidth(400);
- getShell().addDisposeListener(new DisposeListener() {
-
- @Override
- public void widgetDisposed(DisposeEvent e) {
- clearImages();
- }
- });
+ getShell().addDisposeListener(e -> clearImages());
}
@Override
@@ -345,15 +322,11 @@
public void match(final IFile file, final String installLocation) {
if (!cancel) {
- list.getRealm().exec(new Runnable() {
-
- @Override
- public void run() {
- final Entry entry = new Entry();
- entry.file = file;
- entry.installLocation = installLocation;
- list.add(entry);
- }
+ list.getRealm().exec(() -> {
+ final Entry entry = new Entry();
+ entry.file = file;
+ entry.installLocation = installLocation;
+ list.add(entry);
});
}
}
@@ -408,49 +381,44 @@
if (includeNonBundles == false && filter.project.getFile("/META-INF/MANIFEST.MF").exists() == false) { //$NON-NLS-1$
continue;
}
- project.accept(new IResourceVisitor() {
-
- @Override
- public boolean visit(IResource resource) throws CoreException {
- if (callback.cancel) {
- return false;
- }
-
- if (resource.getType() == IResource.FOLDER || resource.getType() == IResource.PROJECT) {
- return true;
- } else if (resource.getType() == IResource.FILE && !resource.isLinked()) {
- final String path = resource.getProjectRelativePath().toString();
- if (matcherGif.match(path) || matcherPng.match(path) || matcherJpg.match(path)) {
- if (E.notEmpty(filter.getPackages())) {
- if (!filter.getPackages().contains(
- resource.getProjectRelativePath().removeLastSegments(1).toOSString())) {
- return false;
- }
- }
- if (E.notEmpty(filter.getLocations())) {
- if (!filter.getLocations().contains(project.getLocation().toOSString())) {
- return false;
- }
- }
- if (E.notEmpty(filter.getBundles())) {
- final String bundle = getBundle(project);
- if (bundle == null || !filter.getBundles().contains(bundle)) {
- return false;
- }
- }
- if (!filter.isIncludeNonBundles()) {
- final String bundle = getBundle(project);
- if (bundle == null) {
- return false;
- }
-
- }
- callback.match((IFile) resource, project.getLocation().toOSString());
- }
- }
+ project.accept(resource -> {
+ if (callback.cancel) {
return false;
}
+ if (resource.getType() == IResource.FOLDER || resource.getType() == IResource.PROJECT) {
+ return true;
+ } else if (resource.getType() == IResource.FILE && !resource.isLinked()) {
+ final String path = resource.getProjectRelativePath().toString();
+ if (matcherGif.match(path) || matcherPng.match(path) || matcherJpg.match(path)) {
+ if (E.notEmpty(filter.getPackages())) {
+ if (!filter.getPackages().contains(
+ resource.getProjectRelativePath().removeLastSegments(1).toOSString())) {
+ return false;
+ }
+ }
+ if (E.notEmpty(filter.getLocations())) {
+ if (!filter.getLocations().contains(project.getLocation().toOSString())) {
+ return false;
+ }
+ }
+ if (E.notEmpty(filter.getBundles())) {
+ final String bundle1 = getBundle(project);
+ if (bundle1 == null || !filter.getBundles().contains(bundle1)) {
+ return false;
+ }
+ }
+ if (!filter.isIncludeNonBundles()) {
+ final String bundle2 = getBundle(project);
+ if (bundle2 == null) {
+ return false;
+ }
+
+ }
+ callback.match((IFile) resource, project.getLocation().toOSString());
+ }
+ }
+ return false;
});
}
} catch (final CoreException e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
index ec1df65..fb5bc05 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2013 - 2015 fhv.at and others.
+ * Copyright (c) 2013, 2017 fhv.at 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
@@ -30,9 +30,7 @@
import org.eclipse.jface.viewers.BaseLabelProvider;
import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider;
import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
-import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IBaseLabelProvider;
-import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StyledString;
import org.eclipse.jface.viewers.TableViewer;
@@ -48,7 +46,7 @@
import org.eclipse.swt.widgets.Text;
public abstract class AbstractIdDialog<ContributionClass, ElementClass extends MApplicationElement> extends
- SaveDialogBoundsSettingsDialog {
+SaveDialogBoundsSettingsDialog {
protected EModelService modelService;
@@ -59,7 +57,7 @@
protected Messages messages;
public AbstractIdDialog(Shell parentShell, IModelResource resource, ContributionClass toolbarContribution,
- EditingDomain domain, EModelService modelService, Messages Messages) {
+ EditingDomain domain, EModelService modelService, Messages Messages) {
super(parentShell);
this.resource = resource;
this.modelService = modelService;
@@ -120,12 +118,7 @@
viewer.setContentProvider(new ArrayContentProvider());
viewer.setLabelProvider(getLabelProvider());
viewer.addFilter(filter);
- viewer.addDoubleClickListener(new IDoubleClickListener() {
- @Override
- public void doubleClick(DoubleClickEvent event) {
- okPressed();
- }
- });
+ viewer.addDoubleClickListener(event -> okPressed());
ControlFactory.attachFiltering(idField, viewer, filter);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
index 20ba298..1d6f27d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010-2014 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at 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
@@ -25,8 +25,6 @@
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.jface.viewers.AbstractTreeViewer;
import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StyledCellLabelProvider;
@@ -35,8 +33,6 @@
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerCell;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
@@ -70,15 +66,9 @@
setMessage(Messages.BindingContextSelectionDialog_Message);
final Image titleImage = new Image(composite.getDisplay(), getClass().getClassLoader().getResourceAsStream(
- "/icons/full/wizban/newexp_wiz.png")); //$NON-NLS-1$
+ "/icons/full/wizban/newexp_wiz.png")); //$NON-NLS-1$
setTitleImage(titleImage);
- getShell().addDisposeListener(new DisposeListener() {
-
- @Override
- public void widgetDisposed(DisposeEvent e) {
- titleImage.dispose();
- }
- });
+ getShell().addDisposeListener(e -> titleImage.dispose());
final Composite container = new Composite(composite, SWT.NONE);
container.setLayoutData(new GridData(GridData.FILL_BOTH));
@@ -95,13 +85,7 @@
viewer.setContentProvider(new ArrayContentProvider());
viewer.setLabelProvider(new LabelProviderImpl());
viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
- viewer.addDoubleClickListener(new IDoubleClickListener() {
-
- @Override
- public void doubleClick(DoubleClickEvent event) {
- okPressed();
- }
- });
+ viewer.addDoubleClickListener(event -> okPressed());
final List<EObject> categories = new ArrayList<>();
final TreeIterator<EObject> it = EcoreUtil.getAllContents((EObject) resource.getRoot().get(0), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
index 3f3d35e..1a2e729 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010-2014 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at 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
@@ -28,8 +28,6 @@
import org.eclipse.emf.edit.command.SetCommand;
import org.eclipse.jface.viewers.AbstractTreeViewer;
import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StyledCellLabelProvider;
@@ -38,8 +36,6 @@
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerCell;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
@@ -56,7 +52,7 @@
private final Messages Messages;
public CommandCategorySelectionDialog(Shell parentShell, IModelResource resource, MCommand command,
- Messages Messages) {
+ Messages Messages) {
super(parentShell);
this.resource = resource;
this.command = command;
@@ -71,15 +67,9 @@
setMessage(Messages.CommandCategorySelectionDialog_Message);
final Image titleImage = new Image(composite.getDisplay(), getClass().getClassLoader().getResourceAsStream(
- "/icons/full/wizban/newexp_wiz.png")); //$NON-NLS-1$
+ "/icons/full/wizban/newexp_wiz.png")); //$NON-NLS-1$
setTitleImage(titleImage);
- getShell().addDisposeListener(new DisposeListener() {
-
- @Override
- public void widgetDisposed(DisposeEvent e) {
- titleImage.dispose();
- }
- });
+ getShell().addDisposeListener(e -> titleImage.dispose());
final Composite container = new Composite(composite, SWT.NONE);
container.setLayoutData(new GridData(GridData.FILL_BOTH));
@@ -96,13 +86,7 @@
viewer.setContentProvider(new ArrayContentProvider());
viewer.setLabelProvider(new LabelProviderImpl());
viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
- viewer.addDoubleClickListener(new IDoubleClickListener() {
-
- @Override
- public void doubleClick(DoubleClickEvent event) {
- okPressed();
- }
- });
+ viewer.addDoubleClickListener(event -> okPressed());
final List<EObject> categories = new ArrayList<>();
final TreeIterator<EObject> it = EcoreUtil.getAllContents((EObject) resource.getRoot().get(0), true);
@@ -132,7 +116,7 @@
final IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
if (!s.isEmpty()) {
final Command cmd = SetCommand.create(resource.getEditingDomain(), command,
- CommandsPackageImpl.Literals.COMMAND__CATEGORY, s.getFirstElement());
+ CommandsPackageImpl.Literals.COMMAND__CATEGORY, s.getFirstElement());
if (cmd.canExecute()) {
resource.getEditingDomain().getCommandStack().execute(cmd);
super.okPressed();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
index 1f60019..73010b2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
Binary files differ
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
index 8a77d96..64abfe4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010-2015 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at 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
@@ -32,13 +32,9 @@
import org.eclipse.emf.edit.command.SetCommand;
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.jface.viewers.StyledCellLabelProvider;
@@ -49,10 +45,6 @@
import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.jface.viewers.ViewerFilter;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
@@ -104,15 +96,11 @@
setTitleImage(newTitleImage);
- composite.addDisposeListener(new DisposeListener() {
-
- @Override
- public void widgetDisposed(DisposeEvent e) {
- packageImage.dispose();
- classImage.dispose();
- featureImage.dispose();
- newTitleImage.dispose();
- }
+ composite.addDisposeListener(e -> {
+ packageImage.dispose();
+ classImage.dispose();
+ featureImage.dispose();
+ newTitleImage.dispose();
});
final Composite container = new Composite(composite, SWT.NONE);
@@ -125,19 +113,15 @@
final Text searchText = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
searchText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- searchText.addModifyListener(new ModifyListener() {
-
- @Override
- public void modifyText(ModifyEvent e) {
- if (filter != null) {
- filter.setPattern(searchText.getText());
- if (viewer != null) {
- viewer.refresh();
- if (searchText.getText().length() > 0) {
- viewer.expandAll();
- } else {
- viewer.collapseAll();
- }
+ searchText.addModifyListener(e -> {
+ if (filter != null) {
+ filter.setPattern(searchText.getText());
+ if (viewer != null) {
+ viewer.refresh();
+ if (searchText.getText().length() > 0) {
+ viewer.expandAll();
+ } else {
+ viewer.collapseAll();
}
}
}
@@ -149,13 +133,7 @@
viewer.getControl().setLayoutData(gd);
viewer.setContentProvider(new ContentProviderImpl());
viewer.setLabelProvider(new LabelProviderImpl(packageImage, classImage, featureImage));
- viewer.addDoubleClickListener(new IDoubleClickListener() {
-
- @Override
- public void doubleClick(DoubleClickEvent event) {
- okPressed();
- }
- });
+ viewer.addDoubleClickListener(event -> okPressed());
viewer.setComparator(new ViewerComparator() {
@Override
public int compare(Viewer viewer, Object e1, Object e2) {
@@ -170,16 +148,13 @@
return super.compare(viewer, e1, e2);
}
});
- viewer.addSelectionChangedListener(new ISelectionChangedListener() {
- @Override
- public void selectionChanged(SelectionChangedEvent event) {
- final IStructuredSelection selection = (IStructuredSelection) event.getSelection();
- final Button buttonOk = getButton(IDialogConstants.OK_ID);
- if (!selection.isEmpty() && selection.getFirstElement().getClass() == InternalFeature.class) {
- buttonOk.setEnabled(true);
- } else {
- buttonOk.setEnabled(false);
- }
+ viewer.addSelectionChangedListener(event -> {
+ final IStructuredSelection selection = (IStructuredSelection) event.getSelection();
+ final Button buttonOk = getButton(IDialogConstants.OK_ID);
+ if (!selection.isEmpty() && selection.getFirstElement().getClass() == InternalFeature.class) {
+ buttonOk.setEnabled(true);
+ } else {
+ buttonOk.setEnabled(false);
}
});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
index 48d3530..c84de39 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
@@ -40,7 +40,6 @@
import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionData;
import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionResultHandler;
import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.Filter;
-import org.eclipse.e4.tools.emf.ui.common.IProviderStatusCallback;
import org.eclipse.e4.tools.emf.ui.common.ProviderStatus;
import org.eclipse.e4.tools.emf.ui.common.ResourceSearchScope;
import org.eclipse.e4.tools.emf.ui.internal.Messages;
@@ -57,8 +56,6 @@
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.text.Document;
import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StyledCellLabelProvider;
import org.eclipse.jface.viewers.StyledString;
@@ -73,12 +70,8 @@
import org.eclipse.pde.internal.core.text.bundle.RequireBundleHeader;
import org.eclipse.pde.internal.core.text.bundle.RequireBundleObject;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.events.KeyAdapter;
import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Image;
@@ -192,28 +185,18 @@
@Override
public void result(final ContributionData data) {
if (!cancled) {
- getShell().getDisplay().syncExec(new Runnable() {
-
- @Override
- public void run() {
- list.add(data);
- }
- });
+ getShell().getDisplay().syncExec(() -> list.add(data));
}
}
@Override
public void moreResults(final int hint, final Filter filter) {
if (!cancled) {
- getShell().getDisplay().syncExec(new Runnable() {
-
- @Override
- public void run() {
- final FilteredContributionDialog dlg = (FilteredContributionDialog) filter.userData;
- dlg.hint = hint;
- dlg.maxResults = filter.maxResults;
- dlg.updateStatusMessage();
- }
+ getShell().getDisplay().syncExec(() -> {
+ final FilteredContributionDialog dlg = (FilteredContributionDialog) filter.userData;
+ dlg.hint = hint;
+ dlg.maxResults = filter.maxResults;
+ dlg.updateStatusMessage();
});
}
}
@@ -258,13 +241,7 @@
}
public void setStatus(final String message) {
- getShell().getDisplay().asyncExec(new Runnable() {
-
- @Override
- public void run() {
- lblStatus.setText(message);
- }
- });
+ getShell().getDisplay().asyncExec(() -> lblStatus.setText(message));
}
@Override
@@ -300,18 +277,14 @@
@Override
protected Control createDialogArea(Composite parent) {
final Composite comp = (Composite) super.createDialogArea(parent);
- getShell().addDisposeListener(new DisposeListener() {
+ getShell().addDisposeListener(e -> {
+ imageCache.dispose();
- @Override
- public void widgetDisposed(DisposeEvent e) {
- imageCache.dispose();
-
- if (contributionTypeImage.isDisposed() == false) {
- contributionTypeImage.dispose();
- }
- if (getTitleImageLabel().getImage() != null && getTitleImage().isDisposed() == false) {
- getTitleImageLabel().getImage().dispose();
- }
+ if (contributionTypeImage.isDisposed() == false) {
+ contributionTypeImage.dispose();
+ }
+ if (getTitleImageLabel().getImage() != null && getTitleImage().isDisposed() == false) {
+ getTitleImageLabel().getImage().dispose();
}
});
@@ -366,103 +339,80 @@
}
});
- textBox.addModifyListener(new ModifyListener() {
+ textBox.addModifyListener(e -> {
+ stopSearchThread(true);
+ setMessage(""); //$NON-NLS-1$
- @Override
- public void modifyText(ModifyEvent e) {
- stopSearchThread(true);
- setMessage(""); //$NON-NLS-1$
-
- viewerList.clear();
- if (doSearch() == true) {
- return;
- }
- searching = true;
- updateStatusMessage();
-
- currentSearchThread = new Job(Messages.FilteredContributionDialog_ContributionSearch) {
-
- Filter filter;
-
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- monitor.beginTask(Messages.FilteredContributionDialog_ContributionSearch,
- IProgressMonitor.UNKNOWN);
- currentResultHandler = new ContributionResultHandlerImpl(viewerList);
- getShell().getDisplay().syncExec(new Runnable() {
-
- @Override
- public void run() {
- if (searchScopes.contains(ResourceSearchScope.PROJECT)) {
- filter = new Filter(context.get(IProject.class), textBox.getText());
- } else {
- // filter = new Filter(null,
- // textBox.getText());
- filter = new Filter(context.get(IProject.class), textBox.getText());
- }
- }
- });
- filter.maxResults = MAX_RESULTS;
- filter.userData = FilteredContributionDialog.this;
- filter.setBundles(filterBundles);
- filter.setPackages(filterPackages);
- filter.setLocations(filterLocations);
- filter.setSearchScope(searchScopes);
- filter.setIncludeNonBundles(includeNonBundles);
- filter.setProgressMonitor(monitor);
- filter.setProviderStatusCallback(new IProviderStatusCallback() {
-
- @Override
- public void onStatusChanged(final ProviderStatus status) {
- providerStatus = status;
- try {
- getShell().getDisplay().syncExec(new Runnable() {
-
- @Override
- public void run() {
- updateStatusMessage();
- switch (status) {
- case READY:
- // This will deadlock if
- // currentSearchThread is not
- // null
- currentSearchThread = null;
- if (currentResultHandler != null) {
- currentResultHandler.cancled = true;
- }
- refreshSearch();
- break;
- case CANCELLED:
- case INITIALIZING:
- break;
- }
- }
- });
- } catch (final Exception e2) {
- // Dialog may have been closed while
- // provider was still indexing
- }
- }
- });
- collector.findContributions(filter, currentResultHandler);
-
- monitor.done();
- searching = false;
- currentSearchThread = null;
- getShell().getDisplay().syncExec(new Runnable() {
-
- @Override
- public void run() {
- updateStatusMessage();
- }
- });
- return Status.OK_STATUS;
- }
-
- };
- currentSearchThread.schedule();
-
+ viewerList.clear();
+ if (doSearch() == true) {
+ return;
}
+ searching = true;
+ updateStatusMessage();
+
+ currentSearchThread = new Job(Messages.FilteredContributionDialog_ContributionSearch) {
+
+ Filter filter;
+
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ monitor.beginTask(Messages.FilteredContributionDialog_ContributionSearch, IProgressMonitor.UNKNOWN);
+ currentResultHandler = new ContributionResultHandlerImpl(viewerList);
+ getShell().getDisplay().syncExec(() -> {
+ if (searchScopes.contains(ResourceSearchScope.PROJECT)) {
+ filter = new Filter(context.get(IProject.class), textBox.getText());
+ } else {
+ // filter = new Filter(null,
+ // textBox.getText());
+ filter = new Filter(context.get(IProject.class), textBox.getText());
+ }
+ });
+ filter.maxResults = MAX_RESULTS;
+ filter.userData = FilteredContributionDialog.this;
+ filter.setBundles(filterBundles);
+ filter.setPackages(filterPackages);
+ filter.setLocations(filterLocations);
+ filter.setSearchScope(searchScopes);
+ filter.setIncludeNonBundles(includeNonBundles);
+ filter.setProgressMonitor(monitor);
+ filter.setProviderStatusCallback(status -> {
+ providerStatus = status;
+ try {
+ getShell().getDisplay().syncExec(() -> {
+ updateStatusMessage();
+ switch (status) {
+ case READY:
+ // This will deadlock if
+ // currentSearchThread is not
+ // null
+ currentSearchThread = null;
+ if (currentResultHandler != null) {
+ currentResultHandler.cancled = true;
+ }
+ refreshSearch();
+ break;
+ case CANCELLED:
+ case INITIALIZING:
+ break;
+ }
+ });
+ } catch (final Exception e2) {
+ // Dialog may have been closed while
+ // provider was still indexing
+ }
+ });
+ collector.findContributions(filter, currentResultHandler);
+
+ monitor.done();
+ searching = false;
+ currentSearchThread = null;
+ getShell().getDisplay().syncExec(() -> updateStatusMessage());
+ return Status.OK_STATUS;
+ }
+
+ };
+ currentSearchThread.schedule();
+
});
return comp;
@@ -887,13 +837,7 @@
cell.setStyleRanges(styledString.getStyleRanges());
}
});
- viewer.addDoubleClickListener(new IDoubleClickListener() {
-
- @Override
- public void doubleClick(DoubleClickEvent event) {
- okPressed();
- }
- });
+ viewer.addDoubleClickListener(event -> okPressed());
viewer.setInput(viewerList);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
index 415c26a..3c84fbb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010-2014 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at 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
@@ -22,16 +22,12 @@
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.edit.command.SetCommand;
import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StyledCellLabelProvider;
import org.eclipse.jface.viewers.StyledString;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.ViewerCell;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
@@ -70,13 +66,7 @@
final Image titleImage = new Image(parent.getDisplay(), getClass().getClassLoader().getResourceAsStream(
"/icons/full/wizban/import_wiz.png")); //$NON-NLS-1$
setTitleImage(titleImage);
- getShell().addDisposeListener(new DisposeListener() {
-
- @Override
- public void widgetDisposed(DisposeEvent e) {
- titleImage.dispose();
- }
- });
+ getShell().addDisposeListener(e -> titleImage.dispose());
getShell().setText(Messages.FindImportElementDialog_ShellTitle);
setTitle(Messages.FindImportElementDialog_Title);
@@ -120,13 +110,7 @@
}
});
viewer.setContentProvider(new ObservableListContentProvider());
- viewer.addDoubleClickListener(new IDoubleClickListener() {
-
- @Override
- public void doubleClick(DoubleClickEvent event) {
- okPressed();
- }
- });
+ viewer.addDoubleClickListener(event -> okPressed());
final WritableList list = new WritableList();
viewer.setInput(list);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
index b397b3c..4920e5c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2015 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at 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
@@ -38,12 +38,8 @@
import org.eclipse.jface.fieldassist.ComboContentAdapter;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.StyledCellLabelProvider;
import org.eclipse.jface.viewers.StyledString;
@@ -52,10 +48,6 @@
import org.eclipse.jface.viewers.ViewerCell;
import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Image;
@@ -120,13 +112,7 @@
final Image titleImage = new Image(parent.getDisplay(),
getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/import_wiz.png")); //$NON-NLS-1$
setTitleImage(titleImage);
- getShell().addDisposeListener(new DisposeListener() {
-
- @Override
- public void widgetDisposed(DisposeEvent e) {
- titleImage.dispose();
- }
- });
+ getShell().addDisposeListener(e -> titleImage.dispose());
getShell().setText(Messages.FindParentReferenceElementDialog_ShellTitle);
setTitle(Messages.FindParentReferenceElementDialog_Title);
@@ -164,13 +150,7 @@
});
eClassViewer.setInput(eClassList);
eClassViewer.getControl().setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- eClassViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
- @Override
- public void selectionChanged(SelectionChangedEvent event) {
- updateSearch();
- }
- });
+ eClassViewer.addSelectionChangedListener(event -> updateSearch());
final ArrayList<String> vals = new ArrayList<>();
for (final EClass item : eClassList) {
@@ -232,24 +212,12 @@
}
});
viewer.setContentProvider(new ObservableListContentProvider());
- viewer.addDoubleClickListener(new IDoubleClickListener() {
-
- @Override
- public void doubleClick(DoubleClickEvent event) {
- okPressed();
- }
- });
+ viewer.addDoubleClickListener(event -> okPressed());
list = new WritableList();
viewer.setInput(list);
- searchText.addModifyListener(new ModifyListener() {
-
- @Override
- public void modifyText(ModifyEvent e) {
- updateSearch();
- }
- });
+ searchText.addModifyListener(e -> updateSearch());
final Button button = new Button(container, SWT.PUSH);
button.setText(Messages.FindParentReferenceElementDialog_ClearCache);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
index 6d63c09..662f976 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010-2014 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at 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
@@ -40,8 +40,6 @@
import org.eclipse.emf.edit.command.SetCommand;
import org.eclipse.jface.viewers.AbstractTreeViewer;
import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StyledCellLabelProvider;
@@ -100,13 +98,7 @@
viewer.setLabelProvider(new LabelProviderImpl());
viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
- viewer.addDoubleClickListener(new IDoubleClickListener() {
-
- @Override
- public void doubleClick(DoubleClickEvent event) {
- okPressed();
- }
- });
+ viewer.addDoubleClickListener(event -> okPressed());
if (resource.getRoot().get(0) instanceof MApplication) {
final List<MUIElement> list = new ArrayList<>();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
index a146115..463e58e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2017 TwelveTone LLC 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
@@ -80,8 +80,6 @@
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CTabFolder;
import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.events.MouseAdapter;
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.events.SelectionAdapter;
@@ -94,8 +92,6 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
@@ -253,7 +249,7 @@
if (E.notEmpty(xml)) {
try {
final Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder()
- .parse(new InputSource(new StringReader(xml)));
+ .parse(new InputSource(new StringReader(xml)));
final XPath xpath = XPathFactory.newInstance().newXPath();
NodeList list;
if (restoreColumns) {
@@ -350,13 +346,7 @@
@PostConstruct
public void postConstruct(final CTabFolder tabFolder) {
imageCache = new BundleImageCache(context.get(Display.class), getClass().getClassLoader());
- tabFolder.addDisposeListener(new DisposeListener() {
-
- @Override
- public void widgetDisposed(DisposeEvent e) {
- imageCache.dispose();
- }
- });
+ tabFolder.addDisposeListener(e -> imageCache.dispose());
try {
imgMarkedItem = imageCache.create(Plugin.ID, "/icons/full/obj16/mark_occurrences.png"); //$NON-NLS-1$
} catch (final Exception e2) {
@@ -590,40 +580,36 @@
app.getContext().set("org.eclipse.e4.tools.active-object-viewer", this); //$NON-NLS-1$
final EAttributeTableViewerColumn colId = new EAttributeTableViewerColumn(tvResults,
- "elementId", "elementId", context); //$NON-NLS-1$//$NON-NLS-2$
+ "elementId", "elementId", context); //$NON-NLS-1$//$NON-NLS-2$
defaultColumns.put("elementId", colId); //$NON-NLS-1$
final EAttributeTableViewerColumn colLabel = new EAttributeTableViewerColumn_Markable(tvResults,
- "label", "label", context); //$NON-NLS-1$//$NON-NLS-2$
+ "label", "label", context); //$NON-NLS-1$//$NON-NLS-2$
defaultColumns.put("label", colLabel); //$NON-NLS-1$
// Custom selection for marked items
- tvResults.getTable().addListener(SWT.EraseItem, new Listener() {
- @Override
- public void handleEvent(Event event) {
- event.detail &= ~SWT.HOT;
- if ((event.detail & SWT.SELECTED) == 0)
- {
- return; // / item not selected
- }
+ tvResults.getTable().addListener(SWT.EraseItem, event -> {
+ event.detail &= ~SWT.HOT;
+ if ((event.detail & SWT.SELECTED) == 0) {
+ return; // / item not selected
+ }
- final TableItem item = (TableItem) event.item;
- if (isHighlighted(item.getData())) {
+ final TableItem item = (TableItem) event.item;
+ if (isHighlighted(item.getData())) {
- final Table table = (Table) event.widget;
- final int clientWidth = table.getClientArea().width;
- final GC gc = event.gc;
- // Color oldForeground = gc.getForeground();
- // Color oldBackground = gc.getBackground();
+ final Table table = (Table) event.widget;
+ final int clientWidth = table.getClientArea().width;
+ final GC gc = event.gc;
+ // Color oldForeground = gc.getForeground();
+ // Color oldBackground = gc.getBackground();
- // gc.setBackground(item.getDisplay().getSystemColor(SWT.COLOR_YELLOW));
- gc.setForeground(item.getDisplay().getSystemColor(SWT.COLOR_RED));
- gc.fillRectangle(0, event.y, clientWidth, event.height);
+ // gc.setBackground(item.getDisplay().getSystemColor(SWT.COLOR_YELLOW));
+ gc.setForeground(item.getDisplay().getSystemColor(SWT.COLOR_RED));
+ gc.fillRectangle(0, event.y, clientWidth, event.height);
- // gc.setForeground(oldForeground);
- // gc.setBackground(oldBackground);
- event.detail &= ~SWT.SELECTED;
- }
+ // gc.setForeground(oldForeground);
+ // gc.setBackground(oldBackground);
+ event.detail &= ~SWT.SELECTED;
}
});
@@ -637,9 +623,9 @@
}
makeSortable(colId.getTableViewerColumn().getColumn(), new AttributeColumnLabelSorter(colId
- .getTableViewerColumn().getColumn(), "elementId")); //$NON-NLS-1$
+ .getTableViewerColumn().getColumn(), "elementId")); //$NON-NLS-1$
makeSortable(colLabel.getTableViewerColumn().getColumn(), new AttributeColumnLabelSorter(colLabel
- .getTableViewerColumn().getColumn(), "label")); //$NON-NLS-1$
+ .getTableViewerColumn().getColumn(), "label")); //$NON-NLS-1$
makeSortable(colItem.getColumn(), new TableViewerUtil.ColumnLabelSorter(colItem.getColumn()));
makeSortable(colMarked.getColumn(), new TableViewerUtil.AbstractInvertableTableSorter() {
@@ -746,7 +732,7 @@
}
};
final TitleAreaFilterDialogWithEmptyOptions dlg = new TitleAreaFilterDialogWithEmptyOptions(
- context.get(Shell.class), renderer) {
+ context.get(Shell.class), renderer) {
@Override
protected Control createContents(Composite parent) {
final Control ret = super.createContents(parent);
@@ -810,7 +796,7 @@
optionalColumns.put(attName, colName);
colName.getTableViewerColumn().getColumn().setMoveable(true);
makeSortable(colName.getTableViewerColumn().getColumn(), new AttributeColumnLabelSorter(colName
- .getTableViewerColumn().getColumn(), attName));
+ .getTableViewerColumn().getColumn(), attName));
tvResults.refresh();
}
}
@@ -848,7 +834,7 @@
private class EAttributeTableViewerColumn_Markable extends EAttributeTableViewerColumn {
public EAttributeTableViewerColumn_Markable(TableViewer tvResults, String label, String attName,
- IEclipseContext context) {
+ IEclipseContext context) {
super(tvResults, label, attName, context);
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
index 6c6dad2..2b11f38 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2017 TwelveTone LLC and others.
* Copyright (c) 2010-2014 BestSolution.at and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -113,21 +113,18 @@
sourceViewer.setDocument(document);
verticalRuler.setModel(model);
- emfDocumentProvider.setValidationChangedCallback(new Runnable() {
- @Override
- public void run() {
- model.removeAllAnnotations();
+ emfDocumentProvider.setValidationChangedCallback(() -> {
+ model.removeAllAnnotations();
- for (final Diagnostic d : emfDocumentProvider.getErrorList()) {
- final Annotation a = new Annotation("e4xmi.error", false, d.getMessage()); //$NON-NLS-1$
- int l;
- try {
- l = document.getLineOffset(d.getLine() - 1);
- model.addAnnotation(a, new Position(l));
- } catch (final BadLocationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ for (final Diagnostic d : emfDocumentProvider.getErrorList()) {
+ final Annotation a = new Annotation("e4xmi.error", false, d.getMessage()); //$NON-NLS-1$
+ int l;
+ try {
+ l = document.getLineOffset(d.getLine() - 1);
+ model.addAnnotation(a, new Position(l));
+ } catch (final BadLocationException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
}
}
});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java
index 4be3633..7703c7f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2017 TwelveTone LLC 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
@@ -14,16 +14,12 @@
import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.Messages;
import org.eclipse.jface.dialogs.TitleAreaDialog;
import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerFilter;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
@@ -80,22 +76,12 @@
}
} });
- text.addModifyListener(new ModifyListener() {
+ text.addModifyListener(e -> viewer.refresh());
- @Override
- public void modifyText(ModifyEvent e) {
- viewer.refresh();
- }
- });
-
- viewer.addDoubleClickListener(new IDoubleClickListener() {
-
- @Override
- public void doubleClick(DoubleClickEvent event) {
- result = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
- if (result != null) {
- okPressed();
- }
+ viewer.addDoubleClickListener(event -> {
+ result = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
+ if (result != null) {
+ okPressed();
}
});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java
index e7dda07..8d04219 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others. All rights reserved. This
+ * Copyright (c) 2014, 2017 TwelveTone LLC 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
@@ -11,6 +11,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+
import org.eclipse.core.resources.IProject;
import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
@@ -22,7 +23,6 @@
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
@@ -93,39 +93,31 @@
txtUri.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
txtUri.setText("bundleclass://"); //$NON-NLS-1$
- txtUri.addModifyListener(new ModifyListener() {
-
- @Override
- public void modifyText(ModifyEvent e) {
- if (ignoreModify) {
- return;
- }
- ignoreModify = true;
- setUri(txtUri.getText());
- txtBundle.setText(bundle);
- txtPackage.setText(pakage);
- txtClass.setText(clazz);
- ignoreModify = false;
- parent.pack();
- }
- });
- }
-
- // common listener for text boxes
- ModifyListener listener = new ModifyListener() {
-
- @Override
- public void modifyText(ModifyEvent e) {
+ txtUri.addModifyListener(e -> {
if (ignoreModify) {
return;
}
ignoreModify = true;
- String prefix;
- prefix = "bundleclass://"; //$NON-NLS-1$
- setUri(prefix + txtBundle.getText() + "/" + txtPackage.getText() + "." + txtClass.getText()); //$NON-NLS-1$//$NON-NLS-2$
- txtUri.setText(getUri());
+ setUri(txtUri.getText());
+ txtBundle.setText(bundle);
+ txtPackage.setText(pakage);
+ txtClass.setText(clazz);
ignoreModify = false;
+ parent.pack();
+ });
+ }
+
+ // common listener for text boxes
+ ModifyListener listener = e -> {
+ if (ignoreModify) {
+ return;
}
+ ignoreModify = true;
+ String prefix;
+ prefix = "bundleclass://"; //$NON-NLS-1$
+ setUri(prefix + txtBundle.getText() + "/" + txtPackage.getText() + "." + txtClass.getText()); //$NON-NLS-1$//$NON-NLS-2$
+ txtUri.setText(getUri());
+ ignoreModify = false;
};
{
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
index 06b7ad8..38a42ae 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at 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
@@ -13,6 +13,7 @@
package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
import java.util.Iterator;
+
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.list.WritableList;
import org.eclipse.core.resources.IProject;
@@ -25,8 +26,6 @@
import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StyledCellLabelProvider;
import org.eclipse.jface.viewers.StyledString;
@@ -35,8 +34,6 @@
import org.eclipse.jface.viewers.ViewerCell;
import org.eclipse.jface.viewers.ViewerFilter;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.events.KeyAdapter;
import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.events.ModifyEvent;
@@ -109,14 +106,10 @@
setTitleImage(titleImage);
}
- getShell().addDisposeListener(new DisposeListener() {
-
- @Override
- public void widgetDisposed(DisposeEvent e) {
- javaClassImage.dispose();
- if (titleImage != null) {
- titleImage.dispose();
- }
+ getShell().addDisposeListener(e -> {
+ javaClassImage.dispose();
+ if (titleImage != null) {
+ titleImage.dispose();
}
});
@@ -193,13 +186,7 @@
cell.setStyleRanges(styledString.getStyleRanges());
}
});
- viewer.addDoubleClickListener(new IDoubleClickListener() {
-
- @Override
- public void doubleClick(DoubleClickEvent event) {
- okPressed();
- }
- });
+ viewer.addDoubleClickListener(event -> okPressed());
final WritableList list = new WritableList();
viewer.setInput(list);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java
index 312364b..bdfdd44 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others. All rights reserved. This
+ * Copyright (c) 2014, 2017 TwelveTone LLC 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
@@ -11,13 +11,13 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+
import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.AbstractIconDialogWithHardcodedScope;
import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.AbstractIconDialogWithScopeAndFilter;
import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
@@ -89,41 +89,33 @@
txtUri.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
txtUri.setText("platform://plugin/"); //$NON-NLS-1$
- txtUri.addModifyListener(new ModifyListener() {
-
- @Override
- public void modifyText(ModifyEvent e) {
- if (ignoreModify) {
- return;
- }
- ignoreModify = true;
- setUri(txtUri.getText());
- txtBundle.setText(bundle);
- txtPath.setText(path);
- txtIcon.setText(icon);
- ignoreModify = false;
- parent.pack();
- }
- });
- }
-
- // common listener for text boxes
- ModifyListener listener = new ModifyListener() {
-
- @Override
- public void modifyText(ModifyEvent e) {
+ txtUri.addModifyListener(e -> {
if (ignoreModify) {
return;
}
ignoreModify = true;
- String prefix;
-
- prefix = "platform:/plugin/"; //$NON-NLS-1$
- setUri(prefix + txtBundle.getText() + "/" + txtPath.getText() + "/" + txtIcon.getText()); //$NON-NLS-1$//$NON-NLS-2$
-
- txtUri.setText(getUri());
+ setUri(txtUri.getText());
+ txtBundle.setText(bundle);
+ txtPath.setText(path);
+ txtIcon.setText(icon);
ignoreModify = false;
+ parent.pack();
+ });
+ }
+
+ // common listener for text boxes
+ ModifyListener listener = e -> {
+ if (ignoreModify) {
+ return;
}
+ ignoreModify = true;
+ String prefix;
+
+ prefix = "platform:/plugin/"; //$NON-NLS-1$
+ setUri(prefix + txtBundle.getText() + "/" + txtPath.getText() + "/" + txtIcon.getText()); //$NON-NLS-1$//$NON-NLS-2$
+
+ txtUri.setText(getUri());
+ ignoreModify = false;
};
{
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
index 7afbb72..ced85b4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2017 TwelveTone LLC 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
@@ -219,13 +219,7 @@
@Override
public void widgetSelected(SelectionEvent e) {
if (btnRequire.getSelection()) {
- final Runnable okAction = new Runnable() {
-
- @Override
- public void run() {
- doRequireBundle(bundle, installLocation);
- }
- };
+ final Runnable okAction = () -> doRequireBundle(bundle, installLocation);
setAction(NonReferencedAction.REQUIRE, okAction);
}
}
@@ -243,33 +237,30 @@
@Override
public void widgetSelected(SelectionEvent e) {
if (btnImport.getSelection()) {
- final Runnable okAction = new Runnable() {
- @Override
- public void run() {
- final IFile fileManifest = project.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
- Manifest manifest;
- try {
- manifest = new Manifest(fileManifest.getContents());
- String value = manifest.getMainAttributes().getValue("Import-Package"); //$NON-NLS-1$
+ final Runnable okAction = () -> {
+ final IFile fileManifest = project.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
+ Manifest manifest;
+ try {
+ manifest = new Manifest(fileManifest.getContents());
+ String value = manifest.getMainAttributes().getValue("Import-Package"); //$NON-NLS-1$
- final String packageName = getPackageFromClassName(className);
- // TODO ensure the packageName is not
- // already in the manifest (although it
- // should not be if we are here)
- if (value == null) {
- value = packageName;
- } else {
- value += "," + packageName; //$NON-NLS-1$
- }
- manifest.getMainAttributes().putValue("Import-Package", value); //$NON-NLS-1$
- final ByteArrayOutputStream bos = new ByteArrayOutputStream();
- manifest.write(bos);
- final ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
- fileManifest.setContents(bis, true, true, null);
- context.set("resolvedFile", file); //$NON-NLS-1$
- } catch (final Exception e) {
- e.printStackTrace();
+ final String packageName = getPackageFromClassName(className);
+ // TODO ensure the packageName is not
+ // already in the manifest (although it
+ // should not be if we are here)
+ if (value == null) {
+ value = packageName;
+ } else {
+ value += "," + packageName; //$NON-NLS-1$
}
+ manifest.getMainAttributes().putValue("Import-Package", value); //$NON-NLS-1$
+ final ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ manifest.write(bos);
+ final ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
+ fileManifest.setContents(bis, true, true, null);
+ context.set("resolvedFile", file); //$NON-NLS-1$
+ } catch (final Exception e1) {
+ e1.printStackTrace();
}
};
setAction(NonReferencedAction.IMPORT, okAction);
@@ -287,12 +278,7 @@
@Override
public void widgetSelected(SelectionEvent e) {
if (btnUseAnyway.getSelection()) {
- setAction(NonReferencedAction.USE_ANYWAY, new Runnable() {
- @Override
- public void run() {
- context.set("resolvedFile", file); //$NON-NLS-1$
- }
- });
+ setAction(NonReferencedAction.USE_ANYWAY, () -> context.set("resolvedFile", file));
}
}
});
@@ -309,31 +295,26 @@
@Override
public void widgetSelected(SelectionEvent e) {
if (btnConvertToBundle.getSelection()) {
- final Runnable okAction = new Runnable() {
+ final Runnable okAction = () -> {
+ String bundleId;
+ try {
+ final ContributionData contributionData = cdf.getContributionData();
+ bundleId = BundleConverter.convertProjectToBundle(contributionData.installLocation,
+ project.getWorkspace());
+ if (bundleId != null) {
- @Override
- public void run() {
- String bundleId;
- try {
- final ContributionData contributionData = cdf.getContributionData();
- bundleId = BundleConverter.convertProjectToBundle(
- contributionData.installLocation, project.getWorkspace());
- if (bundleId != null) {
-
- final ContributionData cdConverted = new ContributionData(bundleId,
- contributionData.className, contributionData.sourceType,
- contributionData.iconPath);
- cdConverted.installLocation = installLocation;
- cdConverted.resourceRelativePath = Path
- .fromOSString(contributionData.iconPath).removeFirstSegments(1)
- .toOSString();
- doRequireBundle(bundleId, installLocation);
- context.set("resolvedFile", new ContributionDataFile(cdConverted)); //$NON-NLS-1$
- }
- } catch (final Exception e1) {
- MessageDialog.openError(getShell(), Messages.NonReferencedResourceDialog_error,
- e1.getMessage());
+ final ContributionData cdConverted = new ContributionData(bundleId,
+ contributionData.className, contributionData.sourceType,
+ contributionData.iconPath);
+ cdConverted.installLocation = installLocation;
+ cdConverted.resourceRelativePath = Path.fromOSString(contributionData.iconPath)
+ .removeFirstSegments(1).toOSString();
+ doRequireBundle(bundleId, installLocation);
+ context.set("resolvedFile", new ContributionDataFile(cdConverted)); //$NON-NLS-1$
}
+ } catch (final Exception e1) {
+ MessageDialog.openError(getShell(), Messages.NonReferencedResourceDialog_error,
+ e1.getMessage());
}
};
setAction(NonReferencedAction.CONVERT_AND_REQUIRE, okAction);
@@ -353,13 +334,7 @@
@Override
public void widgetSelected(SelectionEvent e) {
if (btnCopy.getSelection()) {
- final Runnable okAction = new Runnable() {
-
- @Override
- public void run() {
- copyResourceToProject();
- }
- };
+ final Runnable okAction = () -> copyResourceToProject();
context.set("projectToCopyTo", project); //$NON-NLS-1$
setAction(NonReferencedAction.COPY, okAction);
}
@@ -377,13 +352,7 @@
public void widgetSelected(SelectionEvent e) {
if (btnCopy2.getSelection()) {
- final Runnable okAction = new Runnable() {
-
- @Override
- public void run() {
- copyResourceToProject();
- }
- };
+ final Runnable okAction = () -> copyResourceToProject();
setAction(NonReferencedAction.COPY_TO_OTHER, okAction);
}
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
index aee3f7a..2d633ef 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2017 TwelveTone LLC 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
@@ -39,8 +39,6 @@
import org.eclipse.jface.dialogs.TitleAreaDialog;
import org.eclipse.pde.internal.core.util.CoreUtility;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
@@ -217,13 +215,7 @@
@Override
public void widgetSelected(SelectionEvent e) {
if (btnRequire.getSelection()) {
- okAction = new Runnable() {
-
- @Override
- public void run() {
- doRequireBundle(bundle, installLocation);
- }
- };
+ okAction = () -> doRequireBundle(bundle, installLocation);
}
}
});
@@ -240,33 +232,30 @@
@Override
public void widgetSelected(SelectionEvent e) {
if (btnImport.getSelection()) {
- okAction = new Runnable() {
- @Override
- public void run() {
- final IFile fileManifest = project.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
- Manifest manifest;
- try {
- manifest = new Manifest(fileManifest.getContents());
- String value = manifest.getMainAttributes().getValue("Import-Package"); //$NON-NLS-1$
+ okAction = () -> {
+ final IFile fileManifest = project.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
+ Manifest manifest;
+ try {
+ manifest = new Manifest(fileManifest.getContents());
+ String value = manifest.getMainAttributes().getValue("Import-Package"); //$NON-NLS-1$
- final String packageName = getPackageFromClassName(className);
- // TODO ensure the packageName is not
- // already in the manifest (although it
- // should not be if we are here)
- if (value == null) {
- value = packageName;
- } else {
- value += "," + packageName; //$NON-NLS-1$
- }
- manifest.getMainAttributes().putValue("Import-Package", value); //$NON-NLS-1$
- final ByteArrayOutputStream bos = new ByteArrayOutputStream();
- manifest.write(bos);
- final ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
- fileManifest.setContents(bis, true, true, null);
- result = file;
- } catch (final Exception e) {
- e.printStackTrace();
+ final String packageName = getPackageFromClassName(className);
+ // TODO ensure the packageName is not
+ // already in the manifest (although it
+ // should not be if we are here)
+ if (value == null) {
+ value = packageName;
+ } else {
+ value += "," + packageName; //$NON-NLS-1$
}
+ manifest.getMainAttributes().putValue("Import-Package", value); //$NON-NLS-1$
+ final ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ manifest.write(bos);
+ final ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
+ fileManifest.setContents(bis, true, true, null);
+ result = file;
+ } catch (final Exception e1) {
+ e1.printStackTrace();
}
};
}
@@ -300,31 +289,26 @@
@Override
public void widgetSelected(SelectionEvent e) {
if (btnConvertToBundle.getSelection()) {
- okAction = new Runnable() {
+ okAction = () -> {
+ String bundleId;
+ try {
+ final ContributionData contributionData = cdf.getContributionData();
+ bundleId = BundleConverter.convertProjectToBundle(contributionData.installLocation,
+ project.getWorkspace());
+ if (bundleId != null) {
- @Override
- public void run() {
- String bundleId;
- try {
- final ContributionData contributionData = cdf.getContributionData();
- bundleId = BundleConverter.convertProjectToBundle(
- contributionData.installLocation, project.getWorkspace());
- if (bundleId != null) {
-
- final ContributionData cdConverted = new ContributionData(bundleId,
- contributionData.className, contributionData.sourceType,
- contributionData.iconPath);
- cdConverted.installLocation = installLocation;
- cdConverted.resourceRelativePath = Path
- .fromOSString(contributionData.iconPath).removeFirstSegments(1)
- .toOSString();
- doRequireBundle(bundleId, installLocation);
- result = new ContributionDataFile(cdConverted);
- }
- } catch (final Exception e1) {
- MessageDialog.openError(getShell(), Messages.NonReferencedResourceDialog_error,
- e1.getMessage());
+ final ContributionData cdConverted = new ContributionData(bundleId,
+ contributionData.className, contributionData.sourceType,
+ contributionData.iconPath);
+ cdConverted.installLocation = installLocation;
+ cdConverted.resourceRelativePath = Path.fromOSString(contributionData.iconPath)
+ .removeFirstSegments(1).toOSString();
+ doRequireBundle(bundleId, installLocation);
+ result = new ContributionDataFile(cdConverted);
}
+ } catch (final Exception e1) {
+ MessageDialog.openError(getShell(), Messages.NonReferencedResourceDialog_error,
+ e1.getMessage());
}
};
}
@@ -343,13 +327,7 @@
@Override
public void widgetSelected(SelectionEvent e) {
if (btnCopy.getSelection()) {
- okAction = new Runnable() {
-
- @Override
- public void run() {
- copyResourceToProject(project);
- }
- };
+ okAction = () -> copyResourceToProject(project);
}
}
});
@@ -364,24 +342,20 @@
@Override
public void widgetSelected(SelectionEvent e) {
if (btnCopy2.getSelection()) {
- okAction = new Runnable() {
+ okAction = () -> {
+ final ReferencedProjectPickerDialog dlg = new ReferencedProjectPickerDialog(getShell(),
+ project) {
+ @Override
+ protected Control createContents(Composite parent) {
+ final Control ret = super.createContents(parent);
+ setMessage(Messages.NonReferencedResourceDialog_selectProjectToReceiveCopy);
+ setTitleImage(imageCache.create("/icons/full/wizban/plugin_wiz.gif")); //$NON-NLS-1$
- @Override
- public void run() {
- final ReferencedProjectPickerDialog dlg = new ReferencedProjectPickerDialog(getShell(),
- project) {
- @Override
- protected Control createContents(Composite parent) {
- final Control ret = super.createContents(parent);
- setMessage(Messages.NonReferencedResourceDialog_selectProjectToReceiveCopy);
- setTitleImage(imageCache.create("/icons/full/wizban/plugin_wiz.gif")); //$NON-NLS-1$
-
- return ret;
- }
- };
- if (dlg.open() == IDialogConstants.OK_ID) {
- copyResourceToProject((IProject) dlg.getFirstElement());
+ return ret;
}
+ };
+ if (dlg.open() == IDialogConstants.OK_ID) {
+ copyResourceToProject((IProject) dlg.getFirstElement());
}
};
}
@@ -408,13 +382,7 @@
@Override
protected Control createContents(Composite parent) {
imageCache = new BundleImageCache(parent.getDisplay(), getClass().getClassLoader(), context);
- getShell().addDisposeListener(new DisposeListener() {
-
- @Override
- public void widgetDisposed(DisposeEvent e) {
- imageCache.dispose();
- }
- });
+ getShell().addDisposeListener(e -> imageCache.dispose());
final Control ret = super.createContents(parent);
setMessage(Messages.NonReferencedResourceDialog_resourceNotReferenced);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java
index 5868da5..49db282 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2017 TwelveTone LLC 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
@@ -16,8 +16,6 @@
import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BundleImageCache;
import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.widgets.Shell;
/**
@@ -35,7 +33,7 @@
BundleImageCache imageCache;
public NonReferencedResourceWizard(Shell parentShell, IProject project, String bundle, IFile file,
- String installLocation, IEclipseContext context) {
+ String installLocation, IEclipseContext context) {
this.project = project;
wizContext = context.createChild();
@@ -45,13 +43,7 @@
wizContext.set("resolvedFile", null); //$NON-NLS-1$
imageCache = new BundleImageCache(parentShell.getDisplay(), getClass().getClassLoader(), context);
- parentShell.addDisposeListener(new DisposeListener() {
-
- @Override
- public void widgetDisposed(DisposeEvent e) {
- imageCache.dispose();
- }
- });
+ parentShell.addDisposeListener(e -> imageCache.dispose());
wizContext.set(BundleImageCache.class, imageCache);
nonReferencedActionPage = new NonReferencedActionPage(project, bundle, file, installLocation, wizContext);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java
index d374dc8..6d06f49 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2017 TwelveTone LLC 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
@@ -21,11 +21,7 @@
import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs.ProjectFolderPickerDialog.ProjectContentProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs.ProjectFolderPickerDialog.ProjectLabelProvider;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.wizard.WizardPage;
@@ -76,21 +72,9 @@
viewer.setLabelProvider(new ProjectLabelProvider());
viewer.expandToLevel(2);
- viewer.addDoubleClickListener(new IDoubleClickListener() {
+ viewer.addDoubleClickListener(event -> onChanged());
- @Override
- public void doubleClick(DoubleClickEvent event) {
- onChanged();
- }
- });
-
- viewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
- @Override
- public void selectionChanged(SelectionChangedEvent event) {
- onChanged();
- }
- });
+ viewer.addSelectionChangedListener(event -> onChanged());
Composite compPath = new Composite(ret, SWT.NONE);
compPath.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java
index 572054a..a5125f9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2017 TwelveTone LLC 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
@@ -19,14 +19,10 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
@@ -62,13 +58,9 @@
public void createControl(Composite parent) {
imageCache = new BundleImageCache(parent.getDisplay(), getClass().getClassLoader());
- getShell().addDisposeListener(new DisposeListener() {
-
- @Override
- public void widgetDisposed(DisposeEvent e) {
- imageCache.dispose();
- imgProject = null;
- }
+ getShell().addDisposeListener(e -> {
+ imageCache.dispose();
+ imgProject = null;
});
imgProject = imageCache.create("/icons/full/obj16/projects.png"); //$NON-NLS-1$
@@ -94,15 +86,11 @@
viewer.setInput(projects);
- viewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
- @Override
- public void selectionChanged(SelectionChangedEvent event) {
- final Object firstElement = ((StructuredSelection) event.getSelection()).getFirstElement();
- context.set("projectToCopyTo", firstElement); //$NON-NLS-1$
- setPageComplete(firstElement != null);
- getContainer().updateButtons();
- }
+ viewer.addSelectionChangedListener(event -> {
+ final Object firstElement = ((StructuredSelection) event.getSelection()).getFirstElement();
+ context.set("projectToCopyTo", firstElement); //$NON-NLS-1$
+ setPageComplete(firstElement != null);
+ getContainer().updateButtons();
});
final String message = Messages.ReferencedProjectPickerDialog_selectReferencedProject;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java
index e8f1225..96d553a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2017 TwelveTone LLC 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
@@ -12,9 +12,9 @@
import java.net.URL;
import java.util.ArrayList;
+
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceProxy;
import org.eclipse.core.resources.IResourceProxyVisitor;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
@@ -23,8 +23,6 @@
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.TitleAreaDialog;
import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.TreeViewer;
@@ -83,17 +81,13 @@
}
final IResource resource = (IResource) parentElement;
final ArrayList<Object> list = new ArrayList<>();
- IResourceProxyVisitor visitor = new IResourceProxyVisitor() {
-
- @Override
- public boolean visit(IResourceProxy proxy) throws CoreException {
- if (proxy.getType() == IResource.FOLDER && proxy.requestResource().getParent() == resource) {
- if (proxy.requestResource().equals(resource) == false) {
- list.add(proxy.requestResource());
- }
+ IResourceProxyVisitor visitor = proxy -> {
+ if (proxy.getType() == IResource.FOLDER && proxy.requestResource().getParent() == resource) {
+ if (proxy.requestResource().equals(resource) == false) {
+ list.add(proxy.requestResource());
}
- return true;
}
+ return true;
};
try {
resource.accept(visitor, IResource.DEPTH_ONE);
@@ -119,16 +113,12 @@
final IResource resource = (IResource) element;
try {
found = false;
- resource.accept(new IResourceProxyVisitor() {
-
- @Override
- public boolean visit(IResourceProxy proxy) throws CoreException {
- if (proxy.getType() == IResource.FOLDER && proxy.requestResource().equals(resource) == false) {
- found = true;
- return false;
- }
- return true;
+ resource.accept(proxy -> {
+ if (proxy.getType() == IResource.FOLDER && proxy.requestResource().equals(resource) == false) {
+ found = true;
+ return false;
}
+ return true;
}, IResource.DEPTH_ONE);
} catch (CoreException e) {
e.printStackTrace();
@@ -209,13 +199,7 @@
viewer.setInput(project);
viewer.expandToLevel(2);
- viewer.addDoubleClickListener(new IDoubleClickListener() {
-
- @Override
- public void doubleClick(DoubleClickEvent event) {
- okPressed();
- }
- });
+ viewer.addDoubleClickListener(event -> okPressed());
if (srcPath != null) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ReferencedProjectPickerDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ReferencedProjectPickerDialog.java
index cb301c2..403797b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ReferencedProjectPickerDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ReferencedProjectPickerDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2017 TwelveTone LLC 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
@@ -16,8 +16,6 @@
import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.TitleAreaFilterDialog;
import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages;
import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
@@ -48,13 +46,9 @@
@Override
protected Control createContents(Composite parent) {
imageCache = new BundleImageCache(parent.getDisplay(), getClass().getClassLoader());
- getShell().addDisposeListener(new DisposeListener() {
-
- @Override
- public void widgetDisposed(DisposeEvent e) {
- imageCache.dispose();
- imgProject = null;
- }
+ getShell().addDisposeListener(e -> {
+ imageCache.dispose();
+ imgProject = null;
});
imgProject = imageCache.create("/icons/full/obj16/projects.png"); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
index d481198..9e270c1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2013 Remain BV, Industrial-TSI BV and others.
+ * Copyright (c) 2013, 2017 Remain BV, Industrial-TSI BV and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -13,20 +13,17 @@
package org.eclipse.e4.tools.emf.ui.internal.imp;
import java.util.ArrayList;
+
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtensionRegistry;
import org.eclipse.jface.layout.TableColumnLayout;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
import org.eclipse.jface.viewers.CheckboxTableViewer;
import org.eclipse.jface.viewers.ColumnWeightData;
import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.TableViewerColumn;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.wizard.IWizard;
@@ -143,27 +140,20 @@
comboViewer.setInput(Messages.ModelImportPage1_Go);
- comboViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+ comboViewer.addSelectionChangedListener(event -> {
+ String bundle = ((IStructuredSelection) event.getSelection()).getFirstElement().toString();
+ RegistryStruct struct = RegistryUtil.getStruct(wizard.getApplicationElement(), wizard.getHint());
+ struct.setBundle(bundle);
+ checkboxTableViewer.setInput(struct);
- @Override
- public void selectionChanged(SelectionChangedEvent event) {
- String bundle = ((IStructuredSelection) event.getSelection()).getFirstElement().toString();
- RegistryStruct struct = RegistryUtil.getStruct(wizard.getApplicationElement(), wizard.getHint());
- struct.setBundle(bundle);
- checkboxTableViewer.setInput(struct);
-
- }
});
- checkboxTableViewer.addCheckStateListener(new ICheckStateListener() {
- @Override
- public void checkStateChanged(CheckStateChangedEvent event) {
- checkedElements = checkboxTableViewer.getCheckedElements();
- if (checkedElements.length > 0) {
- setPageComplete(true);
- } else {
- setPageComplete(false);
- }
+ checkboxTableViewer.addCheckStateListener(event -> {
+ checkedElements = checkboxTableViewer.getCheckedElements();
+ if (checkedElements.length > 0) {
+ setPageComplete(true);
+ } else {
+ setPageComplete(false);
}
});
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
index d44a5ef..d96b796 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at and others.
* All rights reserved. This program and the accompanying materials
@@ -129,13 +129,7 @@
private void hidePart(final boolean force) {
- sync.asyncExec(new Runnable() {
-
- @Override
- public void run() {
- partService.hidePart(part, force);
- }
- });
+ sync.asyncExec(() -> partService.hidePart(part, force));
}
};
@@ -147,14 +141,11 @@
*/
protected void statusDialog(final Exception exc) {
try {
- sync.syncExec(new Runnable() {
- @Override
- public void run() {
- String bundle = FrameworkUtil.getBundle(getClass()).getSymbolicName();
- Status status = new Status(IStatus.ERROR, bundle, exc.getMessage());
- ErrorDialog.openError(shell, exc.getMessage(), exc.getMessage(), status);
- exc.printStackTrace(System.err);
- }
+ sync.syncExec(() -> {
+ String bundle = FrameworkUtil.getBundle(getClass()).getSymbolicName();
+ Status status = new Status(IStatus.ERROR, bundle, exc.getMessage());
+ ErrorDialog.openError(shell, exc.getMessage(), exc.getMessage(), status);
+ exc.printStackTrace(System.err);
});
} catch (Exception e) {
}
@@ -164,17 +155,14 @@
* Reload the model.
*/
protected void reloadModel() {
- getModelProvider().getRoot().getRealm().asyncExec(new Runnable() {
- @Override
- public void run() {
- try {
- resource.unload();
- resource.load(null);
- getModelProvider().replaceRoot(resource.getContents().get(0));
- doSave(new NullProgressMonitor());
- } catch (IOException e) {
- statusDialog(e);
- }
+ getModelProvider().getRoot().getRealm().asyncExec(() -> {
+ try {
+ resource.unload();
+ resource.load(null);
+ getModelProvider().replaceRoot(resource.getContents().get(0));
+ doSave(new NullProgressMonitor());
+ } catch (IOException e) {
+ statusDialog(e);
}
});
}
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
index 621db79..f3d0a2f 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
@@ -26,8 +26,6 @@
import org.eclipse.e4.tools.services.IResourceProviderService;
import org.eclipse.e4.tools.services.IResourceService;
import org.eclipse.e4.tools.services.ToolsServicesActivator;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.Image;
@@ -397,13 +395,7 @@
@Override
public IResourcePool getControlPool(Control control) {
final ResourcePool pool = new ResourcePool(this, control.getDisplay());
- control.addDisposeListener(new DisposeListener() {
-
- @Override
- public void widgetDisposed(DisposeEvent e) {
- pool.dispose();
- }
- });
+ control.addDisposeListener(e -> pool.dispose());
return pool;
}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
index ea9b2f7..b52356a 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2016 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at 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
@@ -61,8 +61,6 @@
import org.eclipse.jface.window.Window;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Image;
@@ -193,13 +191,9 @@
"/icons/full/wizban/newclass_wiz.png")); //$NON-NLS-1$
setImageDescriptor(ImageDescriptor.createFromImage(img));
- parent.addDisposeListener(new DisposeListener() {
-
- @Override
- public void widgetDisposed(DisposeEvent e) {
- img.dispose();
- setImageDescriptor(null);
- }
+ parent.addDisposeListener(e -> {
+ img.dispose();
+ setImageDescriptor(null);
});
parent = new Composite(parent, SWT.NULL);
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
index 2c15955..d05ebf3 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010 - 2016 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at 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
@@ -168,12 +168,8 @@
final IWorkbenchPart activePart = page.getActivePart();
if (activePart instanceof ISetSelectionTarget) {
final ISelection targetSelection = new StructuredSelection(modelFile);
- getShell().getDisplay().asyncExec(new Runnable() {
- @Override
- public void run() {
- ((ISetSelectionTarget) activePart).selectReveal(targetSelection);
- }
- });
+ getShell().getDisplay()
+ .asyncExec(() -> ((ISetSelectionTarget) activePart).selectReveal(targetSelection));
}
// Open an editor on the new file.
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
index 00dc0e1..3962b92 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at 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
@@ -23,8 +23,6 @@
import org.eclipse.jface.window.Window;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
@@ -78,12 +76,7 @@
containerText = new Text(container, SWT.BORDER | SWT.SINGLE);
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
containerText.setLayoutData(gd);
- containerText.addModifyListener(new ModifyListener() {
- @Override
- public void modifyText(ModifyEvent e) {
- dialogChanged();
- }
- });
+ containerText.addModifyListener(e -> dialogChanged());
final Button button = new Button(container, SWT.PUSH);
button.setText(Messages.NewModelFilePage_Browse);
@@ -99,12 +92,7 @@
fileText = new Text(container, SWT.BORDER | SWT.SINGLE);
gd = new GridData(GridData.FILL_HORIZONTAL);
fileText.setLayoutData(gd);
- fileText.addModifyListener(new ModifyListener() {
- @Override
- public void modifyText(ModifyEvent e) {
- dialogChanged();
- }
- });
+ fileText.addModifyListener(e -> dialogChanged());
new Label(container, SWT.NONE);
@@ -124,7 +112,7 @@
private void initialize() {
if (selection != null && selection.isEmpty() == false
- && selection instanceof IStructuredSelection) {
+ && selection instanceof IStructuredSelection) {
final IStructuredSelection ssel = (IStructuredSelection) selection;
if (ssel.size() > 1) {
return;
@@ -158,8 +146,8 @@
private void handleBrowse() {
final ContainerSelectionDialog dialog = new ContainerSelectionDialog(
- getShell(), ResourcesPlugin.getWorkspace().getRoot(), false,
- Messages.NewModelFilePage_SelectTheNewContainer);
+ getShell(), ResourcesPlugin.getWorkspace().getRoot(), false,
+ Messages.NewModelFilePage_SelectTheNewContainer);
if (dialog.open() == Window.OK) {
final Object[] result = dialog.getResult();
if (result.length == 1) {
@@ -174,7 +162,7 @@
private void dialogChanged() {
final IResource container = ResourcesPlugin.getWorkspace().getRoot()
- .findMember(new Path(getContainerName()));
+ .findMember(new Path(getContainerName()));
final String fileName = getFileName();
if (getContainerName().length() == 0) {
@@ -182,7 +170,7 @@
return;
}
if (container == null
- || (container.getType() & (IResource.PROJECT | IResource.FOLDER)) == 0) {
+ || (container.getType() & (IResource.PROJECT | IResource.FOLDER)) == 0) {
updateStatus(Messages.NewModelFilePage_FileContainerMustExists);
return;
}
