diff options
author | Alexander Kurtakov | 2019-08-13 08:19:01 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2019-08-13 08:19:01 +0000 |
commit | 7e0cd9a10a1791e56fc400ba253106bf36696141 (patch) | |
tree | f707975b7d62cca84e369e042699ccf72ac766d3 /org.eclipse.m2e.core.ui | |
parent | 0e451d10a1f60231ad162914117ef5b4c99cc615 (diff) | |
download | m2e-core-7e0cd9a10a1791e56fc400ba253106bf36696141.tar.gz m2e-core-7e0cd9a10a1791e56fc400ba253106bf36696141.tar.xz m2e-core-7e0cd9a10a1791e56fc400ba253106bf36696141.zip |
Convert to lambda.
Change-Id: Ief08ed5374ad6738109e11a7ee4ebadb891848c3
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'org.eclipse.m2e.core.ui')
41 files changed, 501 insertions, 892 deletions
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/MavenVersionDecorator.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/MavenVersionDecorator.java index 3e0c8f6b..092c0fed 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/MavenVersionDecorator.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/MavenVersionDecorator.java @@ -18,7 +18,6 @@ import java.util.Map; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jface.viewers.ILabelDecorator; import org.eclipse.jface.viewers.ILabelProviderListener; @@ -30,7 +29,6 @@ import org.eclipse.m2e.core.embedder.ArtifactKey; import org.eclipse.m2e.core.project.IMavenProjectChangedListener; import org.eclipse.m2e.core.project.IMavenProjectFacade; import org.eclipse.m2e.core.project.IMavenProjectRegistry; -import org.eclipse.m2e.core.project.MavenProjectChangedEvent; /** @@ -75,21 +73,19 @@ public class MavenVersionDecorator implements ILabelDecorator { } public void addListener(final ILabelProviderListener listener) { - IMavenProjectChangedListener projectChangeListener = new IMavenProjectChangedListener() { - public void mavenProjectChanged(MavenProjectChangedEvent[] events, IProgressMonitor monitor) { - ArrayList<IResource> pomList = new ArrayList<IResource>(); - for(int i = 0; i < events.length; i++ ) { - // pomList.add(events[i].getSource()); - if(events[i] != null && events[i].getMavenProject() != null) { - IFile pom = events[i].getMavenProject().getPom(); - pomList.add(pom); - if(pom.getParent().getType() == IResource.PROJECT) { - pomList.add(pom.getParent()); - } + IMavenProjectChangedListener projectChangeListener = (events, monitor) -> { + ArrayList<IResource> pomList = new ArrayList<IResource>(); + for(int i = 0; i < events.length; i++ ) { + // pomList.add(events[i].getSource()); + if(events[i] != null && events[i].getMavenProject() != null) { + IFile pom = events[i].getMavenProject().getPom(); + pomList.add(pom); + if(pom.getParent().getType() == IResource.PROJECT) { + pomList.add(pom.getParent()); } } - listener.labelProviderChanged(new LabelProviderChangedEvent(MavenVersionDecorator.this, pomList.toArray())); } + listener.labelProviderChanged(new LabelProviderChangedEvent(MavenVersionDecorator.this, pomList.toArray())); }; listeners.put(listener, projectChangeListener); diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/UpdateMavenProjectJob.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/UpdateMavenProjectJob.java index 825cdf9f..74007491 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/UpdateMavenProjectJob.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/UpdateMavenProjectJob.java @@ -105,12 +105,8 @@ public class UpdateMavenProjectJob extends WorkspaceJob { private void handleErrors(final Map<String, Throwable> updateErrors) { final Display display = Display.getDefault(); if(display != null) { - display.asyncExec(new Runnable() { - public void run() { - M2EUIUtils.showErrorsForProjectsDialog(display.getActiveShell(), Messages.UpdateSourcesAction_error_title, - Messages.UpdateSourcesAction_error_message, updateErrors); - } - }); + display.asyncExec(() -> M2EUIUtils.showErrorsForProjectsDialog(display.getActiveShell(), + Messages.UpdateSourcesAction_error_title, Messages.UpdateSourcesAction_error_message, updateErrors)); } } } diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/MavenDebugOutputAction.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/MavenDebugOutputAction.java index ecdcc273..b247ef6e 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/MavenDebugOutputAction.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/MavenDebugOutputAction.java @@ -14,7 +14,6 @@ package org.eclipse.m2e.core.ui.internal.actions; import org.eclipse.jface.action.Action; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.util.IPropertyChangeListener; -import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.m2e.core.internal.preferences.MavenPreferenceConstants; import org.eclipse.m2e.core.ui.internal.M2EUIPluginActivator; @@ -27,11 +26,9 @@ import org.eclipse.m2e.core.ui.internal.Messages; */ public class MavenDebugOutputAction extends Action { - private IPropertyChangeListener listener = new IPropertyChangeListener() { - public void propertyChange(PropertyChangeEvent event) { - if(MavenPreferenceConstants.P_DEBUG_OUTPUT.equals(event.getProperty())) { - setChecked(isDebug()); - } + private IPropertyChangeListener listener = event -> { + if(MavenPreferenceConstants.P_DEBUG_OUTPUT.equals(event.getProperty())) { + setChecked(isDebug()); } }; diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/OpenPomAction.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/OpenPomAction.java index 6d2c6d3b..6d3afe22 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/OpenPomAction.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/OpenPomAction.java @@ -134,12 +134,9 @@ public class OpenPomAction extends ActionDelegate implements IWorkbenchWindowAct } } catch(CoreException ex) { log.error(ex.getMessage(), ex); - PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { - public void run() { - MessageDialog.openInformation(Display.getDefault().getActiveShell(), // - Messages.OpenPomAction_open_error_title, Messages.OpenPomAction_open_error_message); - } - }); + PlatformUI.getWorkbench().getDisplay() + .asyncExec(() -> MessageDialog.openInformation(Display.getDefault().getActiveShell(), // + Messages.OpenPomAction_open_error_title, Messages.OpenPomAction_open_error_message)); } } } @@ -269,21 +266,19 @@ public class OpenPomAction extends ActionDelegate implements IWorkbenchWindowAct public IEditorPart openPomEditor(final IEditorInput editorInput, final String name) { final IEditorPart[] part = new IEditorPart[1]; - PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() { - public void run() { - IContentTypeManager contentTypeManager = Platform.getContentTypeManager(); - IContentType contentType = contentTypeManager.findContentTypeFor(name); - IEditorRegistry editorRegistry = PlatformUI.getWorkbench().getEditorRegistry(); - IEditorDescriptor editor = editorRegistry.getDefaultEditor(name, contentType); - IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - if(window != null) { - IWorkbenchPage page = window.getActivePage(); - if(page != null) { - try { - part[0] = page.openEditor(editorInput, editor.getId()); - } catch(PartInitException ex) { - openDialog(NLS.bind(Messages.OpenPomAction_33, editorInput.getName(), ex.toString())); - } + PlatformUI.getWorkbench().getDisplay().syncExec(() -> { + IContentTypeManager contentTypeManager = Platform.getContentTypeManager(); + IContentType contentType = contentTypeManager.findContentTypeFor(name); + IEditorRegistry editorRegistry = PlatformUI.getWorkbench().getEditorRegistry(); + IEditorDescriptor editor = editorRegistry.getDefaultEditor(name, contentType); + IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); + if(window != null) { + IWorkbenchPage page = window.getActivePage(); + if(page != null) { + try { + part[0] = page.openEditor(editorInput, editor.getId()); + } catch(PartInitException ex) { + openDialog(NLS.bind(Messages.OpenPomAction_33, editorInput.getName(), ex.toString())); } } } @@ -292,12 +287,8 @@ public class OpenPomAction extends ActionDelegate implements IWorkbenchWindowAct } protected void openDialog(final String msg) { - Runnable r = new Runnable() { - public void run() { - MessageDialog.openInformation(Display.getDefault().getActiveShell(), // - Messages.OpenPomAction_open_title, msg); - } - }; + Runnable r = () -> MessageDialog.openInformation(Display.getDefault().getActiveShell(), // + Messages.OpenPomAction_open_title, msg); Display display = PlatformUI.getWorkbench().getDisplay(); if(display == Display.getCurrent()) { r.run(); diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/components/NestedProjectsComposite.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/components/NestedProjectsComposite.java index aa1145d5..3b9e9f77 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/components/NestedProjectsComposite.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/components/NestedProjectsComposite.java @@ -44,7 +44,6 @@ import org.eclipse.jface.viewers.ISelection; 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.Viewer; import org.eclipse.jface.viewers.ViewerComparator; import org.eclipse.osgi.util.NLS; @@ -219,11 +218,7 @@ public class NestedProjectsComposite extends Composite implements IMenuListener createMenu(); - codebaseViewer.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - updateSelectedProjects(); - } - }); + codebaseViewer.addSelectionChangedListener(event -> updateSelectedProjects()); updateSelectedProjects(); } diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/components/TextComboBoxCellEditor.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/components/TextComboBoxCellEditor.java index 2affc2de..0ceb70fb 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/components/TextComboBoxCellEditor.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/components/TextComboBoxCellEditor.java @@ -17,8 +17,6 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.custom.CCombo; import org.eclipse.swt.events.KeyAdapter; import org.eclipse.swt.events.KeyEvent; -import org.eclipse.swt.events.TraverseEvent; -import org.eclipse.swt.events.TraverseListener; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; @@ -48,11 +46,9 @@ public class TextComboBoxCellEditor extends CellEditor { keyReleaseOccured(e); } }); - combo.addTraverseListener(new TraverseListener() { - public void keyTraversed(TraverseEvent e) { - if(e.detail == SWT.TRAVERSE_ESCAPE || e.detail == SWT.TRAVERSE_RETURN) { - e.doit = false; - } + combo.addTraverseListener(e -> { + if(e.detail == SWT.TRAVERSE_ESCAPE || e.detail == SWT.TRAVERSE_RETURN) { + e.doit = false; } }); diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/components/WorkingSetGroup.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/components/WorkingSetGroup.java index ab7f6022..b0ba0472 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/components/WorkingSetGroup.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/components/WorkingSetGroup.java @@ -24,11 +24,9 @@ import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.resource.LocalResourceManager; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jface.viewers.ComboViewer; -import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredContentProvider; 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.Viewer; import org.eclipse.jface.viewers.ViewerComparator; @@ -201,11 +199,7 @@ public class WorkingSetGroup { } }); - workingsetComboViewer.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - updateConfiguration(); - } - }); + workingsetComboViewer.addSelectionChangedListener(event -> updateConfiguration()); } protected void updateConfiguration() { diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/console/MavenConsoleImpl.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/console/MavenConsoleImpl.java index cfa44455..e79c4999 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/console/MavenConsoleImpl.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/console/MavenConsoleImpl.java @@ -78,12 +78,10 @@ public class MavenConsoleImpl extends IOConsole implements MavenConsole, IProper super.init(); // Ensure that initialization occurs in the UI thread - Display.getDefault().asyncExec(new Runnable() { - public void run() { - JFaceResources.getFontRegistry().addListener(MavenConsoleImpl.this); - initializeConsoleStreams(Display.getDefault()); - dumpConsole(); - } + Display.getDefault().asyncExec(() -> { + JFaceResources.getFontRegistry().addListener(MavenConsoleImpl.this); + initializeConsoleStreams(Display.getDefault()); + dumpConsole(); }); } @@ -147,31 +145,29 @@ public class MavenConsoleImpl extends IOConsole implements MavenConsole, IProper //the synchronization here caused a deadlock. since the writes are simply appending to the output stream //or the document, just doing it on the main thread to avoid deadlocks and or corruption of the //document or output stream - Display.getDefault().asyncExec(new Runnable() { - public void run() { - if(isVisible()) { - try { - switch(type) { - case ConsoleDocument.COMMAND: - getCommandStream().write(line); - getCommandStream().write('\n'); - break; - case ConsoleDocument.MESSAGE: - getMessageStream().write(line); - getMessageStream().write('\n'); - break; - case ConsoleDocument.ERROR: - getErrorStream().write(line); - getErrorStream().write('\n'); - break; - } - } catch(IOException ex) { - // Don't log using slf4j - it will cause a cycle - ex.printStackTrace(); + Display.getDefault().asyncExec(() -> { + if(isVisible()) { + try { + switch(type) { + case ConsoleDocument.COMMAND: + getCommandStream().write(line); + getCommandStream().write('\n'); + break; + case ConsoleDocument.MESSAGE: + getMessageStream().write(line); + getMessageStream().write('\n'); + break; + case ConsoleDocument.ERROR: + getErrorStream().write(line); + getErrorStream().write('\n'); + break; } - } else { - getConsoleDocument().appendConsoleLine(type, line); + } catch(IOException ex) { + // Don't log using slf4j - it will cause a cycle + ex.printStackTrace(); } + } else { + getConsoleDocument().appendConsoleLine(type, line); } }); } @@ -231,11 +227,9 @@ public class MavenConsoleImpl extends IOConsole implements MavenConsole, IProper // Here we can't call super.dispose() because we actually want the partitioner to remain // connected, but we won't show lines until the console is added to the console manager // again. - Display.getDefault().asyncExec(new Runnable() { - public void run() { - setVisible(false); - JFaceResources.getFontRegistry().removeListener(MavenConsoleImpl.this); - } + Display.getDefault().asyncExec(() -> { + setVisible(false); + JFaceResources.getFontRegistry().removeListener(MavenConsoleImpl.this); }); } diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/AssignWorkingSetDialog.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/AssignWorkingSetDialog.java index f5357450..00c34758 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/AssignWorkingSetDialog.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/AssignWorkingSetDialog.java @@ -18,11 +18,7 @@ import java.util.Set; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.dialogs.TitleAreaDialog; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.SelectionChangedEvent; 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; @@ -122,22 +118,16 @@ public class AssignWorkingSetDialog extends TitleAreaDialog { lblNewLabel.setText(Messages.AssignWorkingSetDialog_lblWorkingSet); workingSetCombo = new Combo(workingSetComposite, SWT.BORDER); - workingSetCombo.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - workingSetName = workingSetCombo.getText(); - } - }); + workingSetCombo.addModifyListener(e -> workingSetName = workingSetCombo.getText()); GridData gd_workingSetName = new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1); gd_workingSetName.horizontalIndent = 10; workingSetCombo.setLayoutData(gd_workingSetName); workingSetCombo.setItems(WorkingSets.getWorkingSets()); - selectedProjects.addSelectionChangeListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - IProject selection = selectedProjects.getSelection(); - if(selection != null && workingSetCombo.getSelectionIndex() < 0) { - workingSetCombo.setText(selection.getName()); - } + selectedProjects.addSelectionChangeListener(event -> { + IProject selection = selectedProjects.getSelection(); + if(selection != null && workingSetCombo.getSelectionIndex() < 0) { + workingSetCombo.setText(selection.getName()); } }); diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/InputHistory.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/InputHistory.java index 238ceba8..b9787189 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/InputHistory.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/InputHistory.java @@ -13,8 +13,6 @@ import java.util.Set; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.swt.SWTException; import org.eclipse.swt.custom.CCombo; -import org.eclipse.swt.events.DisposeEvent; -import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Control; @@ -145,11 +143,7 @@ public class InputHistory { protected ControlWrapper(Control control) { this.control = control; - control.addDisposeListener(new DisposeListener() { - public void widgetDisposed(DisposeEvent e) { - collect(); - } - }); + control.addDisposeListener(e -> collect()); } protected void collect() { diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/MavenPropertyDialog.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/MavenPropertyDialog.java index 2fcdf99a..55b0633b 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/MavenPropertyDialog.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/MavenPropertyDialog.java @@ -15,8 +15,6 @@ package org.eclipse.m2e.core.ui.internal.dialogs; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.VerifyEvent; import org.eclipse.swt.events.VerifyListener; import org.eclipse.swt.layout.GridData; @@ -78,11 +76,7 @@ public class MavenPropertyDialog extends Dialog { nameText.setLayoutData(gd); nameText.setFont(comp.getFont()); nameText.setText(initialName == null ? "" : initialName); //$NON-NLS-1$ - nameText.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - updateButtons(); - } - }); + nameText.addModifyListener(e -> updateButtons()); Label valueLabel = new Label(comp, SWT.NONE); valueLabel.setText(Messages.launchPropertyDialogValue); @@ -94,11 +88,7 @@ public class MavenPropertyDialog extends Dialog { valueText.setLayoutData(gd); valueText.setFont(comp.getFont()); valueText.setText(initialValue == null ? "" : initialValue); //$NON-NLS-1$ - valueText.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - updateButtons(); - } - }); + valueText.addModifyListener(e -> updateButtons()); // if(variables) { // Button variablesButton = new Button(comp, SWT.PUSH); diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/MavenRepositorySearchDialog.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/MavenRepositorySearchDialog.java index d28c4dda..696b7a18 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/MavenRepositorySearchDialog.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/MavenRepositorySearchDialog.java @@ -20,13 +20,7 @@ import java.util.Set; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.jface.viewers.DoubleClickEvent; -import org.eclipse.jface.viewers.IDoubleClickListener; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.SelectionChangedEvent; 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.Combo; @@ -242,18 +236,14 @@ public class MavenRepositorySearchDialog extends AbstractMavenDialog { pomSelectionComponent.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - pomSelectionComponent.addDoubleClickListener(new IDoubleClickListener() { - public void doubleClick(DoubleClickEvent event) { - if(!pomSelectionComponent.getStatus().matches(IStatus.ERROR)) { - okPressedDelegate(); - } + pomSelectionComponent.addDoubleClickListener(event -> { + if(!pomSelectionComponent.getStatus().matches(IStatus.ERROR)) { + okPressedDelegate(); } }); - pomSelectionComponent.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - updateStatusDelegate(pomSelectionComponent.getStatus()); - computeResultFromTree(); - } + pomSelectionComponent.addSelectionChangedListener(event -> { + updateStatusDelegate(pomSelectionComponent.getStatus()); + computeResultFromTree(); }); pomSelectionComponent.setFocus(); @@ -334,34 +324,25 @@ public class MavenRepositorySearchDialog extends AbstractMavenDialog { ProposalUtil.addArtifactIdProposal(project, txtGroupId, txtArtifactId, pack); ProposalUtil.addVersionProposal(project, mavenproject, txtGroupId, txtArtifactId, txtVersion, pack); - txtArtifactId.addModifyListener(new ModifyListener() { - - public void modifyText(ModifyEvent e) { - updateStatus(validateArtifactEntries()); - if(!ignoreTextChange && !hasDisposedTextField()) { - computeResultFromField(valueOrNull(txtGroupId.getText()), valueOrNull(txtArtifactId.getText()), - valueOrNull(txtVersion.getText())); - } + txtArtifactId.addModifyListener(e -> { + updateStatus(validateArtifactEntries()); + if(!ignoreTextChange && !hasDisposedTextField()) { + computeResultFromField(valueOrNull(txtGroupId.getText()), valueOrNull(txtArtifactId.getText()), + valueOrNull(txtVersion.getText())); } }); - txtGroupId.addModifyListener(new ModifyListener() { - - public void modifyText(ModifyEvent e) { - updateStatus(validateArtifactEntries()); - if(!ignoreTextChange && !hasDisposedTextField()) { - computeResultFromField(valueOrNull(txtGroupId.getText()), valueOrNull(txtArtifactId.getText()), - valueOrNull(txtVersion.getText())); - } + txtGroupId.addModifyListener(e -> { + updateStatus(validateArtifactEntries()); + if(!ignoreTextChange && !hasDisposedTextField()) { + computeResultFromField(valueOrNull(txtGroupId.getText()), valueOrNull(txtArtifactId.getText()), + valueOrNull(txtVersion.getText())); } }); - txtVersion.addModifyListener(new ModifyListener() { - - public void modifyText(ModifyEvent e) { - if(!ignoreTextChange && !hasDisposedTextField()) { - computeResultFromField(valueOrNull(txtGroupId.getText()), valueOrNull(txtArtifactId.getText()), - valueOrNull(txtVersion.getText())); - } + txtVersion.addModifyListener(e -> { + if(!ignoreTextChange && !hasDisposedTextField()) { + computeResultFromField(valueOrNull(txtGroupId.getText()), valueOrNull(txtArtifactId.getText()), + valueOrNull(txtVersion.getText())); } }); diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/LifecycleMappingPreferencePage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/LifecycleMappingPreferencePage.java index c3a632f8..25f4cff7 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/LifecycleMappingPreferencePage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/LifecycleMappingPreferencePage.java @@ -21,8 +21,6 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.jface.preference.PreferencePage; 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.GridLayout; @@ -127,11 +125,7 @@ public class LifecycleMappingPreferencePage extends PreferencePage implements IW mappingFileTextBox = new Text(composite, SWT.BORDER); mappingFileTextBox.setText(getCurrentLocation()); - mappingFileTextBox.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - mappingFilePath = mappingFileTextBox.getText(); - } - }); + mappingFileTextBox.addModifyListener(e -> mappingFilePath = mappingFileTextBox.getText()); Button newFileButton = new Button(composite, SWT.PUSH); newFileButton.setText(Messages.LifecycleMappingPreferencePage_Browse); diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/LocalArchetypeCatalogDialog.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/LocalArchetypeCatalogDialog.java index 0301bdd2..687002cc 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/LocalArchetypeCatalogDialog.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/LocalArchetypeCatalogDialog.java @@ -24,7 +24,6 @@ import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.dialogs.TitleAreaDialog; import org.eclipse.osgi.util.NLS; 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; @@ -142,11 +141,7 @@ public class LocalArchetypeCatalogDialog extends TitleAreaDialog { catalogDescriptionText.setText(archetypeCatalogFactory.getDescription()); } - ModifyListener modifyListener = new ModifyListener() { - public void modifyText(final ModifyEvent e) { - update(); - } - }; + ModifyListener modifyListener = e -> update(); catalogLocationCombo.addModifyListener(modifyListener); catalogDescriptionText.addModifyListener(modifyListener); diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenArchetypesPreferencePage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenArchetypesPreferencePage.java index 31ebd440..4acd613f 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenArchetypesPreferencePage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenArchetypesPreferencePage.java @@ -26,11 +26,9 @@ import org.eclipse.jface.preference.PreferencePage; import org.eclipse.jface.viewers.CheckboxTableViewer; import org.eclipse.jface.viewers.IColorProvider; import org.eclipse.jface.viewers.ILabelProviderListener; -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.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.window.Window; @@ -266,14 +264,12 @@ public class MavenArchetypesPreferencePage extends PreferencePage implements IWo } }); - archetypesViewer.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - if(archetypesViewer.getSelection() instanceof IStructuredSelection) { - ArchetypeCatalogFactory factory = getSelectedArchetypeCatalogFactory(); - boolean isEnabled = factory != null && factory.isEditable(); - removeButton.setEnabled(isEnabled); - editButton.setEnabled(isEnabled); - } + archetypesViewer.addSelectionChangedListener(event -> { + if(archetypesViewer.getSelection() instanceof IStructuredSelection) { + ArchetypeCatalogFactory factory = getSelectedArchetypeCatalogFactory(); + boolean isEnabled = factory != null && factory.isEditable(); + removeButton.setEnabled(isEnabled); + editButton.setEnabled(isEnabled); } }); diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenSettingsPreferencePage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenSettingsPreferencePage.java index b58fe7f9..e359736c 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenSettingsPreferencePage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenSettingsPreferencePage.java @@ -32,7 +32,6 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.osgi.util.NLS; 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; @@ -48,7 +47,6 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.ui.IEditorDescriptor; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IPropertyListener; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchPreferencePage; @@ -285,11 +283,9 @@ public class MavenSettingsPreferencePage extends PreferencePage implements IWork } }); - ModifyListener settingsModifyListener = new ModifyListener() { - public void modifyText(ModifyEvent modifyevent) { - updateLocalRepository(); - checkSettings(); - } + ModifyListener settingsModifyListener = modifyevent -> { + updateLocalRepository(); + checkSettings(); }; userSettingsText.addModifyListener(settingsModifyListener); globalSettingsText.addModifyListener(settingsModifyListener); @@ -400,11 +396,9 @@ public class MavenSettingsPreferencePage extends PreferencePage implements IWork //external editor was opened return; } - editor.addPropertyListener(new IPropertyListener() { - public void propertyChanged(Object source, int propId) { - if(!editor.isDirty()) { - log.info("Refreshing settings " + fileName); //$NON-NLS-1$ - } + editor.addPropertyListener((source, propId) -> { + if(!editor.isDirty()) { + log.info("Refreshing settings " + fileName); //$NON-NLS-1$ } }); } catch(PartInitException ex) { diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/RemoteArchetypeCatalogDialog.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/RemoteArchetypeCatalogDialog.java index afedca3e..7243a606 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/RemoteArchetypeCatalogDialog.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/RemoteArchetypeCatalogDialog.java @@ -27,7 +27,6 @@ import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.dialogs.TitleAreaDialog; import org.eclipse.osgi.util.NLS; 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; @@ -137,11 +136,7 @@ public class RemoteArchetypeCatalogDialog extends TitleAreaDialog { catalogDescriptionText.setText(archetypeCatalogFactory.getDescription()); } - ModifyListener modifyListener = new ModifyListener() { - public void modifyText(final ModifyEvent e) { - update(); - } - }; + ModifyListener modifyListener = e -> update(); catalogUrlCombo.addModifyListener(modifyListener); catalogDescriptionText.addModifyListener(modifyListener); @@ -188,21 +183,19 @@ public class RemoteArchetypeCatalogDialog extends TitleAreaDialog { if(shell == null) { return status; } - shell.getDisplay().asyncExec(new Runnable() { - public void run() { - if(verifyButton.isDisposed()) { - return; - } - verifyButton.setEnabled(true); - if(!s.isOK()) { - setErrorMessage(NLS.bind(Messages.RemoteArchetypeCatalogDialog_error_read, s.getMessage())); - getButton(IDialogConstants.OK_ID).setEnabled(false); - } else if(archetypes.size() == 0) { - setMessage(Messages.RemoteArchetypeCatalogDialog_error_empty, IStatus.WARNING); - } else { - setMessage(NLS.bind(Messages.RemoteArchetypeCatalogDialog_message_found, archetypes.size()), - IStatus.INFO); - } + shell.getDisplay().asyncExec(() -> { + if(verifyButton.isDisposed()) { + return; + } + verifyButton.setEnabled(true); + if(!s.isOK()) { + setErrorMessage(NLS.bind(Messages.RemoteArchetypeCatalogDialog_error_read, s.getMessage())); + getButton(IDialogConstants.OK_ID).setEnabled(false); + } else if(archetypes.size() == 0) { + setMessage(Messages.RemoteArchetypeCatalogDialog_error_empty, IStatus.WARNING); + } else { + setMessage(NLS.bind(Messages.RemoteArchetypeCatalogDialog_message_found, archetypes.size()), + IStatus.INFO); } }); } diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/launch/MavenInstallationWizardPage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/launch/MavenInstallationWizardPage.java index f2812612..c2433d52 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/launch/MavenInstallationWizardPage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/launch/MavenInstallationWizardPage.java @@ -15,24 +15,19 @@ import java.io.File; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.Comparator; import java.util.List; import java.util.Set; import org.eclipse.core.resources.IProject; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ILabelProviderListener; -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.TreeViewer; import org.eclipse.jface.viewers.Viewer; 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.graphics.Image; @@ -181,11 +176,7 @@ public class MavenInstallationWizardPage extends WizardPage { lblInstallationLocation.setText(Messages.ExternalInstallPage_lblInstallationLocation_text); location = new Text(container, SWT.BORDER); - location.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - updateStatus(); - } - }); + location.addModifyListener(e -> updateStatus()); location.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); btnDirectory = new Button(container, SWT.NONE); @@ -202,11 +193,7 @@ public class MavenInstallationWizardPage extends WizardPage { lblInstallationName.setText(Messages.ExternalInstallPage_lblInstallationName_text); name = new Text(container, SWT.BORDER); - name.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - updateStatus(); - } - }); + name.addModifyListener(e -> updateStatus()); name.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1)); Label lblInstallationLibraries = new Label(container, SWT.NONE); @@ -214,11 +201,7 @@ public class MavenInstallationWizardPage extends WizardPage { lblInstallationLibraries.setText(Messages.ExternalInstallPage_lblInstallationLibraries_text); treeViewerLibrariries = new TreeViewer(container, SWT.BORDER); - treeViewerLibrariries.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - updateButtonsState(); - } - }); + treeViewerLibrariries.addSelectionChangedListener(event -> updateButtonsState()); treeViewerLibrariries.setContentProvider(new TreeContentProvider()); treeViewerLibrariries.setLabelProvider(new TreeLabelProvider()); treeViewerLibrariries.setInput(extensions); @@ -342,11 +325,7 @@ public class MavenInstallationWizardPage extends WizardPage { projects.add(project); } } - Collections.sort(projects, new Comparator<IProject>() { - public int compare(IProject p1, IProject p2) { - return p1.getName().compareTo(p2.getName()); - } - }); + Collections.sort(projects, (p1, p2) -> p1.getName().compareTo(p2.getName())); ElementListSelectionDialog dialog = new ElementListSelectionDialog(getShell(), new MavenProjectLabelProvider()); dialog.setElements(projects.toArray()); dialog.setMessage(Messages.MavenInstallationWizardPage_selectProjectMessage); diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/launch/MavenInstallationsPreferencePage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/launch/MavenInstallationsPreferencePage.java index beed797c..a972a4f2 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/launch/MavenInstallationsPreferencePage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/launch/MavenInstallationsPreferencePage.java @@ -16,16 +16,12 @@ import java.util.List; import java.util.Set; import org.eclipse.jface.preference.PreferencePage; -import org.eclipse.jface.viewers.CheckStateChangedEvent; import org.eclipse.jface.viewers.CheckboxTableViewer; -import org.eclipse.jface.viewers.ICheckStateListener; import org.eclipse.jface.viewers.IColorProvider; import org.eclipse.jface.viewers.ILabelProviderListener; -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.SelectionChangedEvent; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.WizardDialog; @@ -254,22 +250,16 @@ public class MavenInstallationsPreferencePage extends PreferencePage implements } }); - runtimesViewer.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - if(runtimesViewer.getSelection() instanceof IStructuredSelection) { - AbstractMavenRuntime runtime = getSelectedMavenRuntime(); - boolean isEnabled = runtime != null && runtime.isEditable(); - removeButton.setEnabled(isEnabled); - editButton.setEnabled(isEnabled); - } + runtimesViewer.addSelectionChangedListener(event -> { + if(runtimesViewer.getSelection() instanceof IStructuredSelection) { + AbstractMavenRuntime runtime = getSelectedMavenRuntime(); + boolean isEnabled = runtime != null && runtime.isEditable(); + removeButton.setEnabled(isEnabled); + editButton.setEnabled(isEnabled); } }); - runtimesViewer.addCheckStateListener(new ICheckStateListener() { - public void checkStateChanged(CheckStateChangedEvent event) { - setCheckedRuntime((AbstractMavenRuntime) event.getElement()); - } - }); + runtimesViewer.addCheckStateListener(event -> setCheckedRuntime((AbstractMavenRuntime) event.getElement())); Label noteLabel = new Label(composite, SWT.WRAP); GridData noteLabelData = new GridData(SWT.FILL, SWT.TOP, false, false, 2, 1); noteLabelData.widthHint = 100; diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/search/util/ControlDecoration.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/search/util/ControlDecoration.java index 294218e2..91e8c82e 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/search/util/ControlDecoration.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/search/util/ControlDecoration.java @@ -15,7 +15,6 @@ import org.eclipse.core.runtime.ListenerList; import org.eclipse.jface.fieldassist.FieldDecoration; import org.eclipse.jface.fieldassist.FieldDecorationRegistry; import org.eclipse.swt.SWT; -import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.events.FocusEvent; import org.eclipse.swt.events.FocusListener; @@ -23,7 +22,6 @@ import org.eclipse.swt.events.MouseAdapter; import org.eclipse.swt.events.MouseEvent; import org.eclipse.swt.events.MouseMoveListener; import org.eclipse.swt.events.MouseTrackListener; -import org.eclipse.swt.events.PaintEvent; import org.eclipse.swt.events.PaintListener; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; @@ -244,12 +242,10 @@ public class ControlDecoration { hoverShell = new Shell(parent, SWT.NO_TRIM | SWT.ON_TOP | SWT.NO_FOCUS | SWT.TOOL); hoverShell.setBackground(display.getSystemColor(SWT.COLOR_INFO_BACKGROUND)); hoverShell.setForeground(display.getSystemColor(SWT.COLOR_INFO_FOREGROUND)); - hoverShell.addPaintListener(new PaintListener() { - public void paintControl(PaintEvent pe) { - pe.gc.drawText(text, hm, hm); - if(!CARBON) { - pe.gc.drawPolygon(getPolygon(true)); - } + hoverShell.addPaintListener(pe -> { + pe.gc.drawText(text, hm, hm); + if(!CARBON) { + pe.gc.drawPolygon(getPolygon(true)); } }); hoverShell.addMouseListener(new MouseAdapter() { @@ -515,11 +511,7 @@ public class ControlDecoration { * Add any listeners needed on the target control and on the composite where the decoration is to be rendered. */ private void addControlListeners() { - disposeListener = new DisposeListener() { - public void widgetDisposed(DisposeEvent event) { - dispose(); - } - }; + disposeListener = event -> dispose(); printAddListener(control, "DISPOSE"); //$NON-NLS-1$ control.addDisposeListener(disposeListener); @@ -542,28 +534,24 @@ public class ControlDecoration { control.addFocusListener(focusListener); // Listener for painting the decoration - paintListener = new PaintListener() { - public void paintControl(PaintEvent event) { - Control control = (Control) event.widget; - Rectangle rect = getDecorationRectangle(control); - if(shouldShowDecoration()) { - event.gc.drawImage(getImage(), rect.x, rect.y); - } + paintListener = event -> { + Control control = (Control) event.widget; + Rectangle rect = getDecorationRectangle(control); + if(shouldShowDecoration()) { + event.gc.drawImage(getImage(), rect.x, rect.y); } }; // Listener for tracking the end of a hover. Only installed // after a hover begins. - mouseMoveListener = new MouseMoveListener() { - public void mouseMove(MouseEvent event) { - if(showHover) { - if(!decorationRectangle.contains(event.x, event.y)) { - hideHover(); - // No need to listen any longer - printRemoveListener(event.widget, "MOUSEMOVE"); //$NON-NLS-1$ - ((Control) event.widget).removeMouseMoveListener(mouseMoveListener); - moveListeningTarget = null; - } + mouseMoveListener = event -> { + if(showHover) { + if(!decorationRectangle.contains(event.x, event.y)) { + hideHover(); + // No need to listen any longer + printRemoveListener(event.widget, "MOUSEMOVE"); //$NON-NLS-1$ + ((Control) event.widget).removeMouseMoveListener(mouseMoveListener); + moveListeningTarget = null; } } }; @@ -609,27 +597,25 @@ public class ControlDecoration { } }; - compositeListener = new Listener() { - public void handleEvent(Event event) { - // Don't forward events if decoration is not showing - if(!visible) { - return; - } - // Notify listeners if any are registered. - switch(event.type) { - case SWT.MouseDown: - if(!selectionListeners.isEmpty()) - notifySelectionListeners(event); - break; - case SWT.MouseDoubleClick: - if(!selectionListeners.isEmpty()) - notifySelectionListeners(event); - break; - case SWT.MenuDetect: - if(!menuDetectListeners.isEmpty()) - notifyMenuDetectListeners(event); - break; - } + compositeListener = event -> { + // Don't forward events if decoration is not showing + if(!visible) { + return; + } + // Notify listeners if any are registered. + switch(event.type) { + case SWT.MouseDown: + if(!selectionListeners.isEmpty()) + notifySelectionListeners(event); + break; + case SWT.MouseDoubleClick: + if(!selectionListeners.isEmpty()) + notifySelectionListeners(event); + break; + case SWT.MenuDetect: + if(!menuDetectListeners.isEmpty()) + notifyMenuDetectListeners(event); + break; } }; diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/util/M2EUIUtils.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/util/M2EUIUtils.java index bec34e4f..fedf2762 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/util/M2EUIUtils.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/util/M2EUIUtils.java @@ -67,15 +67,13 @@ public class M2EUIUtils { public static void showErrorsForProjectsDialog(final Shell shell, final String title, final String message, final Map<String, Throwable> errorMap) { // TODO Auto-generated method showErrorsForProjectsDialog - Display.getDefault().asyncExec(new Runnable() { - public void run() { - String[] buttons = {IDialogConstants.OK_LABEL}; - int ok_button = 0; - M2EErrorDialog errDialog = new M2EErrorDialog(shell, title, Dialog.getImage(Dialog.DLG_IMG_MESSAGE_ERROR), - message, MessageDialog.ERROR, buttons, ok_button, errorMap); - errDialog.create(); - errDialog.open(); - } + Display.getDefault().asyncExec(() -> { + String[] buttons = {IDialogConstants.OK_LABEL}; + int ok_button = 0; + M2EErrorDialog errDialog = new M2EErrorDialog(shell, title, Dialog.getImage(Dialog.DLG_IMG_MESSAGE_ERROR), + message, MessageDialog.ERROR, buttons, ok_button, errorMap); + errDialog.create(); + errDialog.open(); }); } diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/MavenRepositoryView.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/MavenRepositoryView.java index a500be64..92da3ab0 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/MavenRepositoryView.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/MavenRepositoryView.java @@ -26,15 +26,12 @@ import org.eclipse.core.runtime.SubMonitor; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; -import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.DecoratingStyledCellLabelProvider; -import org.eclipse.jface.viewers.DoubleClickEvent; -import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; @@ -153,10 +150,8 @@ public class MavenRepositoryView extends ViewPart { viewer.setLabelProvider(new DecoratingStyledCellLabelProvider(labelProvider, PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator(), null)); - viewer.addDoubleClickListener(new IDoubleClickListener() { - public void doubleClick(DoubleClickEvent event) { + viewer.addDoubleClickListener(event -> { - } }); viewer.setInput(getViewSite()); drillDownAdapter = new DrillDownAdapter(viewer); @@ -164,11 +159,7 @@ public class MavenRepositoryView extends ViewPart { makeActions(); hookContextMenu(); - viewer.addDoubleClickListener(new IDoubleClickListener() { - public void doubleClick(DoubleClickEvent event) { - openPomAction.run(); - } - }); + viewer.addDoubleClickListener(event -> openPomAction.run()); contributeToActionBars(); this.indexListener = new IndexListener() { @@ -186,11 +177,7 @@ public class MavenRepositoryView extends ViewPart { } public void indexUpdating(IRepository repository) { - Display.getDefault().asyncExec(new Runnable() { - public void run() { - viewer.refresh(true); - } - }); + Display.getDefault().asyncExec(() -> viewer.refresh(true)); } }; @@ -200,11 +187,9 @@ public class MavenRepositoryView extends ViewPart { private void hookContextMenu() { MenuManager menuMgr = new MenuManager("#PopupMenu-" + MENU_ID); //$NON-NLS-1$ menuMgr.setRemoveAllWhenShown(true); - menuMgr.addMenuListener(new IMenuListener() { - public void menuAboutToShow(IMenuManager manager) { - MavenRepositoryView.this.fillContextMenu(manager); - manager.update(); - } + menuMgr.addMenuListener(manager -> { + MavenRepositoryView.this.fillContextMenu(manager); + manager.update(); }); Menu menu = menuMgr.createContextMenu(viewer.getControl()); @@ -376,12 +361,8 @@ public class MavenRepositoryView extends ViewPart { : Messages.MavenRepositoryView_rebuild_msg2; final boolean result[] = new boolean[1]; - Display.getDefault().syncExec(new Runnable() { - - public void run() { - result[0] = MessageDialog.openConfirm(getViewSite().getShell(), title, msg); - } - }); + Display.getDefault() + .syncExec(() -> result[0] = MessageDialog.openConfirm(getViewSite().getShell(), title, msg)); if(result[0]) { SubMonitor mon = SubMonitor.convert(monitor, nodes.size()); try { @@ -555,14 +536,12 @@ public class MavenRepositoryView extends ViewPart { } void refreshView() { - Display.getDefault().asyncExec(new Runnable() { - public void run() { - Object[] expandedElems = viewer.getExpandedElements(); - if(!viewer.getControl().isDisposed()) { - viewer.setInput(getViewSite()); - if(expandedElems != null && expandedElems.length > 0) { - viewer.setExpandedElements(expandedElems); - } + Display.getDefault().asyncExec(() -> { + Object[] expandedElems = viewer.getExpandedElements(); + if(!viewer.getControl().isDisposed()) { + viewer.setInput(getViewSite()); + if(expandedElems != null && expandedElems.length > 0) { + viewer.setExpandedElements(expandedElems); } } }); diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/build/BuildDebugView.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/build/BuildDebugView.java index 81265573..b1e5e16f 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/build/BuildDebugView.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/build/BuildDebugView.java @@ -25,7 +25,6 @@ import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceDelta; -import org.eclipse.core.resources.IResourceDeltaVisitor; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; @@ -63,14 +62,12 @@ import org.eclipse.m2e.core.ui.internal.Messages; @SuppressWarnings("restriction") public class BuildDebugView extends ViewPart implements BuildDebugHook { - /*package*/static final Comparator<Node> NODE_COMPARATOR = new Comparator<Node>() { - public int compare(Node p1, Node p2) { - int d = p2.getBuildCount() - p1.getBuildCount(); - if(d != 0) { - return d; - } - return p1.getName().compareTo(p2.getName()); + /*package*/static final Comparator<Node> NODE_COMPARATOR = (p1, p2) -> { + int d = p2.getBuildCount() - p1.getBuildCount(); + if(d != 0) { + return d; } + return p1.getName().compareTo(p2.getName()); }; /*package*/TreeViewer viewer; @@ -82,14 +79,7 @@ public class BuildDebugView extends ViewPart implements BuildDebugHook { /*package*/final Job refreshJob = new Job("") { protected IStatus run(IProgressMonitor monitor) { - getSite().getShell().getDisplay().asyncExec(new Runnable() { - public void run() { - viewer.refresh(); -// for(TreeColumn column : viewer.getTree().getColumns()) { -// column.pack(); -// } - } - }); + getSite().getShell().getDisplay().asyncExec(() -> viewer.refresh()); return Status.OK_STATUS; } }; @@ -273,16 +263,14 @@ public class BuildDebugView extends ViewPart implements BuildDebugHook { try { if(delta != null) { - delta.accept(new IResourceDeltaVisitor() { - public boolean visit(IResourceDelta delta) { - if(delta.getAffectedChildren().length == 0) { - IResource resource = delta.getResource(); - if(resource instanceof IFile || resource instanceof IFolder) { - projectNode.addResource(resource.getProjectRelativePath()).setBuildCount(buildCount); - } + delta.accept(delta1 -> { + if(delta1.getAffectedChildren().length == 0) { + IResource resource = delta1.getResource(); + if(resource instanceof IFile || resource instanceof IFolder) { + projectNode.addResource(resource.getProjectRelativePath()).setBuildCount(buildCount); } - return true; // keep visiting } + return true; // keep visiting }); } refreshJob.schedule(1000L); diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/CustomArchetypeDialog.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/CustomArchetypeDialog.java index ddc5d3dc..ccbe4136 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/CustomArchetypeDialog.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/CustomArchetypeDialog.java @@ -21,7 +21,6 @@ import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.dialogs.TitleAreaDialog; 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; @@ -142,11 +141,7 @@ public class CustomArchetypeDialog extends TitleAreaDialog { repositoryCombo.setItems(getSavedValues(KEY_REPOSITORY_URL)); repositoryCombo.setData("name", "repository"); //$NON-NLS-1$ //$NON-NLS-2$ - ModifyListener modifyListener = new ModifyListener() { - public void modifyText(final ModifyEvent e) { - update(); - } - }; + ModifyListener modifyListener = e -> update(); archetypeGroupIdCombo.addModifyListener(modifyListener); archetypeArtifactIdCombo.addModifyListener(modifyListener); diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/LifecycleMappingPage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/LifecycleMappingPage.java index 5abda768..1f72360f 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/LifecycleMappingPage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/LifecycleMappingPage.java @@ -40,11 +40,9 @@ import org.eclipse.jface.viewers.ColumnWeightData; import org.eclipse.jface.viewers.ComboBoxCellEditor; import org.eclipse.jface.viewers.EditingSupport; import org.eclipse.jface.viewers.ILabelProviderListener; -import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.ITreeContentProvider; -import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.TreeViewerColumn; import org.eclipse.jface.viewers.Viewer; @@ -444,34 +442,30 @@ public class LifecycleMappingPage extends WizardPage { } }); - treeViewer.addSelectionChangedListener(new ISelectionChangedListener() { - - @SuppressWarnings("synthetic-access") - public void selectionChanged(SelectionChangedEvent event) { - if(event.getSelection() instanceof IStructuredSelection - && ((IStructuredSelection) event.getSelection()).size() == 1) { - ILifecycleMappingLabelProvider prov = (ILifecycleMappingLabelProvider) ((IStructuredSelection) event - .getSelection()).getFirstElement(); - if(ignore.contains(prov)) { - details.setText(Messages.LifecycleMappingPage_doNotExecutePomDescription); - license.setText(EMPTY_STRING); - } else if(ignoreAtDefinition.contains(prov)) { - details.setText(Messages.LifecycleMappingPage_doNotExecuteParentDescription); - license.setText(EMPTY_STRING); - } else if(ignoreWorkspace.contains(prov)) { - details.setText(Messages.LifecycleMappingPage_doNotExecuteWorkspaceDescription); - license.setText(EMPTY_STRING); - } else { - IMavenDiscoveryProposal proposal = mappingConfiguration.getSelectedProposal(prov.getKey()); - details.setText(proposal != null ? proposal.getDescription() - : mappingConfiguration.getProposals(prov.getKey()).isEmpty() - ? NLS.bind(Messages.LifecycleMappingPage_noMarketplaceEntryDescription, prov.getMavenText()) - : EMPTY_STRING); - license.setText(proposal == null ? EMPTY_STRING : proposal.getLicense()); - } + treeViewer.addSelectionChangedListener(event -> { + if(event.getSelection() instanceof IStructuredSelection + && ((IStructuredSelection) event.getSelection()).size() == 1) { + ILifecycleMappingLabelProvider prov = (ILifecycleMappingLabelProvider) ((IStructuredSelection) event + .getSelection()).getFirstElement(); + if(ignore.contains(prov)) { + details.setText(Messages.LifecycleMappingPage_doNotExecutePomDescription); + license.setText(EMPTY_STRING); + } else if(ignoreAtDefinition.contains(prov)) { + details.setText(Messages.LifecycleMappingPage_doNotExecuteParentDescription); + license.setText(EMPTY_STRING); + } else if(ignoreWorkspace.contains(prov)) { + details.setText(Messages.LifecycleMappingPage_doNotExecuteWorkspaceDescription); + license.setText(EMPTY_STRING); } else { - resetDetails(); + IMavenDiscoveryProposal proposal = mappingConfiguration.getSelectedProposal(prov.getKey()); + details.setText(proposal != null ? proposal.getDescription() + : mappingConfiguration.getProposals(prov.getKey()).isEmpty() + ? NLS.bind(Messages.LifecycleMappingPage_noMarketplaceEntryDescription, prov.getMavenText()) + : EMPTY_STRING); + license.setText(proposal == null ? EMPTY_STRING : proposal.getLicense()); } + } else { + resetDetails(); } }); diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MappingDiscoveryJob.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MappingDiscoveryJob.java index b03ec3d2..67acbed8 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MappingDiscoveryJob.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MappingDiscoveryJob.java @@ -70,13 +70,10 @@ public class MappingDiscoveryJob extends WorkspaceJob { final MavenDiscoveryProposalWizard proposalWizard = new MavenDiscoveryProposalWizard(projects, discoveryRequest); proposalWizard.init(null, null); - Display.getDefault().asyncExec(new Runnable() { - @Override - public void run() { - final IWorkbench workbench = PlatformUI.getWorkbench(); - WizardDialog dialog = new WizardDialog(workbench.getActiveWorkbenchWindow().getShell(), proposalWizard); - dialog.open(); - } + Display.getDefault().asyncExec(() -> { + final IWorkbench workbench = PlatformUI.getWorkbench(); + WizardDialog dialog = new WizardDialog(workbench.getActiveWorkbenchWindow().getShell(), proposalWizard); + dialog.open(); }); } diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenDependenciesWizardPage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenDependenciesWizardPage.java index e8bba957..7d5bd704 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenDependenciesWizardPage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenDependenciesWizardPage.java @@ -162,11 +162,9 @@ public class MavenDependenciesWizardPage extends AbstractMavenWizardPage { } }); - dependencyViewer.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - IStructuredSelection selection = (IStructuredSelection) event.getSelection(); - removeDependencyButton.setEnabled(selection.size() > 0); - } + dependencyViewer.addSelectionChangedListener(event -> { + IStructuredSelection selection = (IStructuredSelection) event.getSelection(); + removeDependencyButton.setEnabled(selection.size() > 0); }); } diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenImportWizardPage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenImportWizardPage.java index 7514e11d..88540e22 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenImportWizardPage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenImportWizardPage.java @@ -38,25 +38,19 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.viewers.CheckStateChangedEvent; import org.eclipse.jface.viewers.CheckboxTreeViewer; import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider; -import org.eclipse.jface.viewers.ICheckStateListener; import org.eclipse.jface.viewers.IColorProvider; -import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.ITreeSelection; import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StyledString; import org.eclipse.jface.viewers.Viewer; import org.eclipse.osgi.util.NLS; 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.graphics.Color; @@ -67,9 +61,7 @@ import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.DirectoryDialog; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.MenuItem; import org.eclipse.swt.widgets.Tree; @@ -186,15 +178,13 @@ public class MavenImportWizardPage extends AbstractMavenWizardPage { } }); - rootDirectoryCombo.addListener(SWT.Traverse, new Listener() { - public void handleEvent(Event e) { - if(e.keyCode == SWT.CR && rootDirectoryChanged()) { - //New location entered : don't finish the wizard - if(e.detail == SWT.TRAVERSE_RETURN) { - e.doit = false; - } - scanProjects(); + rootDirectoryCombo.addListener(SWT.Traverse, e -> { + if(e.keyCode == SWT.CR && rootDirectoryChanged()) { + //New location entered : don't finish the wizard + if(e.detail == SWT.TRAVERSE_RETURN) { + e.doit = false; } + scanProjects(); } }); @@ -215,11 +205,7 @@ public class MavenImportWizardPage extends AbstractMavenWizardPage { public void widgetSelected(SelectionEvent e) { if(rootDirectoryChanged()) { //in runnable to have the combo popup collapse before disabling controls. - Display.getDefault().asyncExec(new Runnable() { - public void run() { - scanProjects(); - } - }); + Display.getDefault().asyncExec(() -> scanProjects()); } } }); @@ -231,31 +217,26 @@ public class MavenImportWizardPage extends AbstractMavenWizardPage { projectTreeViewer = new CheckboxTreeViewer(composite, SWT.BORDER); - projectTreeViewer.addCheckStateListener(new ICheckStateListener() { - public void checkStateChanged(CheckStateChangedEvent event) { - updateCheckedState(); - setPageComplete(); - } + projectTreeViewer.addCheckStateListener(event -> { + updateCheckedState(); + setPageComplete(); }); - projectTreeViewer.addSelectionChangedListener(new ISelectionChangedListener() { - - public void selectionChanged(SelectionChangedEvent event) { - IStructuredSelection selection = (IStructuredSelection) event.getSelection(); - btnSelectTree.setEnabled(!selection.isEmpty()); - btnDeselectTree.setEnabled(!selection.isEmpty()); - if(selection.getFirstElement() != null) { - String errorMsg = validateProjectInfo((MavenProjectInfo) selection.getFirstElement()); - if(errorMsg != null) { - setMessage(errorMsg, IMessageProvider.WARNING); - } else { - //TODO if no error on current, shall show any existing general errors if found.. - setMessage(loadingErrorMessage, IMessageProvider.WARNING); - } + projectTreeViewer.addSelectionChangedListener(event -> { + IStructuredSelection selection = (IStructuredSelection) event.getSelection(); + btnSelectTree.setEnabled(!selection.isEmpty()); + btnDeselectTree.setEnabled(!selection.isEmpty()); + if(selection.getFirstElement() != null) { + String errorMsg = validateProjectInfo((MavenProjectInfo) selection.getFirstElement()); + if(errorMsg != null) { + setMessage(errorMsg, IMessageProvider.WARNING); } else { - //TODO if on current selection, shall show any existing general errors if existing.. + //TODO if no error on current, shall show any existing general errors if found.. setMessage(loadingErrorMessage, IMessageProvider.WARNING); } + } else { + //TODO if on current selection, shall show any existing general errors if existing.. + setMessage(loadingErrorMessage, IMessageProvider.WARNING); } }); @@ -408,15 +389,7 @@ public class MavenImportWizardPage extends AbstractMavenWizardPage { workingSetName.setLayoutData(gd_workingSet); createAdvancedSettings(composite, new GridData(SWT.FILL, SWT.TOP, false, false, 3, 1)); - resolverConfigurationComponent.template.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent arg0) { - Display.getDefault().asyncExec(new Runnable() { - public void run() { - validate(); - } - }); - } - }); + resolverConfigurationComponent.template.addModifyListener(arg0 -> Display.getDefault().asyncExec(() -> validate())); if(locations != null && !locations.isEmpty()) { scanProjects(); diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenInstallFileArtifactWizardPage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenInstallFileArtifactWizardPage.java index 545f4a45..5d12f9bf 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenInstallFileArtifactWizardPage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenInstallFileArtifactWizardPage.java @@ -21,7 +21,6 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.osgi.util.NLS; 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; @@ -86,11 +85,7 @@ public class MavenInstallFileArtifactWizardPage extends WizardPage { container.setLayout(new GridLayout(3, false)); container.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - ModifyListener modifyingListener = new ModifyListener() { - public void modifyText(ModifyEvent e) { - pageChanged(); - } - }; + ModifyListener modifyingListener = e -> pageChanged(); Label artifactFileNameLabel = new Label(container, SWT.NONE); artifactFileNameLabel.setText(Messages.MavenInstallFileArtifactWizardPage_lblFileName); @@ -98,11 +93,9 @@ public class MavenInstallFileArtifactWizardPage extends WizardPage { artifactFileNameText = new Text(container, SWT.BORDER); artifactFileNameText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); artifactFileNameText.setData("name", "artifactFileNametext"); //$NON-NLS-1$ //$NON-NLS-2$ - artifactFileNameText.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - updateFileName(getArtifactFileName()); - pageChanged(); - } + artifactFileNameText.addModifyListener(e -> { + updateFileName(getArtifactFileName()); + pageChanged(); }); final Button artifactFileNameButton = new Button(container, SWT.NONE); @@ -127,11 +120,9 @@ public class MavenInstallFileArtifactWizardPage extends WizardPage { pomFileNameText = new Text(container, SWT.BORDER); pomFileNameText.setData("name", "pomFileNameText"); //$NON-NLS-1$ //$NON-NLS-2$ pomFileNameText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); - pomFileNameText.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - generatePomButton.setSelection(getPomFileName().length() == 0); - pageChanged(); - } + pomFileNameText.addModifyListener(e -> { + generatePomButton.setSelection(getPomFileName().length() == 0); + pageChanged(); }); final Button pomFileNameButton = new Button(container, SWT.NONE); @@ -220,11 +211,7 @@ public class MavenInstallFileArtifactWizardPage extends WizardPage { GridData classifierTextData = new GridData(SWT.LEFT, SWT.CENTER, false, false, 2, 1); classifierTextData.widthHint = 150; classifierCombo.setLayoutData(classifierTextData); - classifierCombo.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - generatePomButton.setSelection(getClassifier().length() == 0); - } - }); + classifierCombo.addModifyListener(e -> generatePomButton.setSelection(getClassifier().length() == 0)); if(file != null) { updateFileName(file.getLocation().toOSString()); diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenModuleWizard.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenModuleWizard.java index 00bf9122..c573c612 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenModuleWizard.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenModuleWizard.java @@ -25,7 +25,6 @@ import java.util.Properties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.w3c.dom.Document; import org.w3c.dom.Element; import org.eclipse.core.resources.IFile; @@ -39,11 +38,7 @@ import org.eclipse.core.runtime.jobs.IJobChangeEvent; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.core.runtime.jobs.JobChangeAdapter; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.osgi.util.NLS; -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.widgets.Composite; @@ -129,24 +124,16 @@ public class MavenModuleWizard extends AbstractMavenProjectWizard implements INe } }); - parentPage.addModuleNameListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - parametersPage.setProjectName(parentPage.getModuleName()); - artifactPage.setProjectName(parentPage.getModuleName()); - } + parentPage.addModuleNameListener(e -> { + parametersPage.setProjectName(parentPage.getModuleName()); + artifactPage.setProjectName(parentPage.getModuleName()); }); - parentPage.addParentProjectListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - copyParentValues(); - } - }); + parentPage.addParentProjectListener(e -> copyParentValues()); - archetypePage.addArchetypeSelectionListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent selectionchangedevent) { - parametersPage.setArchetype(archetypePage.getArchetype()); - getContainer().updateButtons(); - } + archetypePage.addArchetypeSelectionListener(selectionchangedevent -> { + parametersPage.setArchetype(archetypePage.getArchetype()); + getContainer().updateButtons(); }); if(selection != null && selection.size() > 0) { @@ -273,13 +260,11 @@ public class MavenModuleWizard extends AbstractMavenProjectWizard implements INe if(!isEditor) { //add the <module> element to the parent pom try { - performOnDOMDocument(new OperationTuple(parentPom, new Operation() { - public void process(Document document) { - Element root = document.getDocumentElement(); - Element modules = getChild(root, "modules"); //$NON-NLS-1$ - if(findChild(modules, "module", textEquals(moduleName)) == null) { //$NON-NLS-1$ - format(createElementWithText(modules, "module", moduleName)); //$NON-NLS-1$ - } + performOnDOMDocument(new OperationTuple(parentPom, (Operation) document -> { + Element root = document.getDocumentElement(); + Element modules = getChild(root, "modules"); //$NON-NLS-1$ + if(findChild(modules, "module", textEquals(moduleName)) == null) { //$NON-NLS-1$ + format(createElementWithText(modules, "module", moduleName)); //$NON-NLS-1$ } })); } catch(Exception e) { @@ -288,13 +273,9 @@ public class MavenModuleWizard extends AbstractMavenProjectWizard implements INe } } else { - Display.getDefault().asyncExec(new Runnable() { - public void run() { - MessageDialog.openError(getShell(), // - NLS.bind(Messages.wizardProjectJobFailed, moduleName), // - result.getMessage()); - } - }); + Display.getDefault().asyncExec(() -> MessageDialog.openError(getShell(), // + NLS.bind(Messages.wizardProjectJobFailed, moduleName), // + result.getMessage())); } } }); diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenModuleWizardParentPage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenModuleWizardParentPage.java index 3c6e6d88..dca4bdc7 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenModuleWizardParentPage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenModuleWizardParentPage.java @@ -27,7 +27,6 @@ import org.eclipse.core.runtime.Path; import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.IWizardPage; 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; @@ -119,11 +118,7 @@ public class MavenModuleWizardParentPage extends AbstractMavenWizardPage { GridData gd_moduleNameCombo = new GridData(SWT.FILL, SWT.TOP, true, false, 2, 1); gd_moduleNameCombo.verticalIndent = 10; moduleNameCombo.setLayoutData(gd_moduleNameCombo); - moduleNameCombo.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - validate(); - } - }); + moduleNameCombo.addModifyListener(e -> validate()); addFieldWithHistory("moduleName", moduleNameCombo); //$NON-NLS-1$ Label parentLabel = new Label(container, SWT.NONE); diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenPomSelectionComponent.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenPomSelectionComponent.java index db51dc18..f27ca231 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenPomSelectionComponent.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenPomSelectionComponent.java @@ -50,8 +50,6 @@ import org.eclipse.swt.events.FocusEvent; import org.eclipse.swt.events.FocusListener; 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.graphics.Color; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; @@ -168,11 +166,7 @@ public class MavenPomSelectionComponent extends Composite { } }); - searchText.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - scheduleSearch(searchText.getText(), true); - } - }); + searchText.addModifyListener(e -> scheduleSearch(searchText.getText(), true)); if(!MavenPlugin.getMavenConfiguration().isUpdateIndexesOnStartup()) { createWarningArea(this); @@ -272,38 +266,34 @@ public class MavenPomSelectionComponent extends Composite { decoratingLabelProvider.setDecorationContext(decorationContext); searchResultViewer.setLabelProvider(decoratingLabelProvider); - searchResultViewer.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - IStructuredSelection selection = (IStructuredSelection) event.getSelection(); - if(!selection.isEmpty()) { - List<IndexedArtifactFile> files = getSelectedIndexedArtifactFiles(selection); + searchResultViewer.addSelectionChangedListener(event -> { + IStructuredSelection selection = (IStructuredSelection) event.getSelection(); + if(!selection.isEmpty()) { + List<IndexedArtifactFile> files = getSelectedIndexedArtifactFiles(selection); - ArtifactFilterManager filterManager = MavenPluginActivator.getDefault().getArifactFilterManager(); + ArtifactFilterManager filterManager = MavenPluginActivator.getDefault().getArifactFilterManager(); - for(IndexedArtifactFile file : files) { - ArtifactKey key = file.getAdapter(ArtifactKey.class); - IStatus status = filterManager.filter(MavenPomSelectionComponent.this.project, key); - if(!status.isOK()) { - setStatus(IStatus.ERROR, status.getMessage()); - return; // TODO not nice to exit method like this - } + for(IndexedArtifactFile file : files) { + ArtifactKey key = file.getAdapter(ArtifactKey.class); + IStatus status = filterManager.filter(MavenPomSelectionComponent.this.project, key); + if(!status.isOK()) { + setStatus(IStatus.ERROR, status.getMessage()); + return; // TODO not nice to exit method like this } + } - if(files.size() == 1) { - IndexedArtifactFile f = files.get(0); - // int severity = artifactKeys.contains(f.group + ":" + f.artifact) ? IStatus.ERROR : IStatus.OK; - int severity = IStatus.OK; - String date = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.SHORT).format(f.date); - setStatus( - severity, - NLS.bind(Messages.MavenPomSelectionComponent_detail1, f.fname, - (f.size != -1 ? NLS.bind(Messages.MavenPomSelectionComponent_details2, date, f.size) : date))); - } else { - setStatus(IStatus.OK, NLS.bind(Messages.MavenPomSelectionComponent_selected, selection.size())); - } + if(files.size() == 1) { + IndexedArtifactFile f = files.get(0); + // int severity = artifactKeys.contains(f.group + ":" + f.artifact) ? IStatus.ERROR : IStatus.OK; + int severity = IStatus.OK; + String date = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.SHORT).format(f.date); + setStatus(severity, NLS.bind(Messages.MavenPomSelectionComponent_detail1, f.fname, + (f.size != -1 ? NLS.bind(Messages.MavenPomSelectionComponent_details2, date, f.size) : date))); } else { - setStatus(IStatus.ERROR, Messages.MavenPomSelectionComponent_nosel); + setStatus(IStatus.OK, NLS.bind(Messages.MavenPomSelectionComponent_selected, selection.size())); } + } else { + setStatus(IStatus.ERROR, Messages.MavenPomSelectionComponent_nosel); } }); setupClassifiers(); @@ -502,13 +492,11 @@ public class MavenPomSelectionComponent extends Composite { private void setResult(final int severity, final String message, final Map<String, IndexedArtifact> result) { if(stop) return; - Display.getDefault().syncExec(new Runnable() { - public void run() { - setStatus(severity, message); - if(result != null) { - if(!searchResultViewer.getControl().isDisposed()) { - searchResultViewer.setInput(result); - } + Display.getDefault().syncExec(() -> { + setStatus(severity, message); + if(result != null) { + if(!searchResultViewer.getControl().isDisposed()) { + searchResultViewer.setInput(result); } } }); diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenPomWizard.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenPomWizard.java index 5795bb50..84386952 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenPomWizard.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenPomWizard.java @@ -86,17 +86,15 @@ public class MavenPomWizard extends Wizard implements INewWizard { final String projectName = artifactPage.getProject(); final Model model = artifactPage.getModel(); - IRunnableWithProgress op = new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException { - monitor.beginTask(Messages.MavenPomWizard_task, 1); - try { - doFinish(projectName, model, monitor); - monitor.worked(1); - } catch(CoreException e) { - throw new InvocationTargetException(e); - } finally { - monitor.done(); - } + IRunnableWithProgress op = monitor -> { + monitor.beginTask(Messages.MavenPomWizard_task, 1); + try { + doFinish(projectName, model, monitor); + monitor.worked(1); + } catch(CoreException e) { + throw new InvocationTargetException(e); + } finally { + monitor.done(); } }; @@ -144,13 +142,11 @@ public class MavenPomWizard extends Wizard implements INewWizard { MavenModelManager modelManager = MavenPlugin.getMavenModelManager(); modelManager.createMavenModel(file, model); - getShell().getDisplay().asyncExec(new Runnable() { - public void run() { - IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); - try { - IDE.openEditor(page, file, true); - } catch(PartInitException e) { - } + getShell().getDisplay().asyncExec(() -> { + IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); + try { + IDE.openEditor(page, file, true); + } catch(PartInitException e) { } }); diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenPomWizardPage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenPomWizardPage.java index e57d4cf6..003a8ae5 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenPomWizardPage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenPomWizardPage.java @@ -21,7 +21,6 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; 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.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -65,11 +64,7 @@ public class MavenPomWizardPage extends AbstractMavenWizardPage { Composite container = new Composite(parent, SWT.NULL); container.setLayout(layout); - ModifyListener modifyingListener = new ModifyListener() { - public void modifyText(ModifyEvent e) { - dialogChanged(); - } - }; + ModifyListener modifyingListener = e -> dialogChanged(); Label label = new Label(container, SWT.NULL); label.setText(Messages.MavenPomWizardPage_lblProject); diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectSelectionDialog.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectSelectionDialog.java index 7393f62f..1c8f5950 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectSelectionDialog.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectSelectionDialog.java @@ -24,8 +24,6 @@ import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.Path; -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; @@ -109,11 +107,7 @@ public class MavenProjectSelectionDialog extends AbstractMavenDialog { getViewer().setLabelProvider(WorkbenchLabelProvider.getDecoratingWorkbenchLabelProvider()); getViewer().setInput(ResourcesPlugin.getWorkspace()); - getViewer().addDoubleClickListener(new IDoubleClickListener() { - public void doubleClick(DoubleClickEvent event) { - okPressed(); - } - }); + getViewer().addDoubleClickListener(event -> okPressed()); return composite; } diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizard.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizard.java index 152fa268..0187798f 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizard.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizard.java @@ -26,8 +26,6 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.jobs.IJobChangeEvent; import org.eclipse.core.runtime.jobs.JobChangeAdapter; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; @@ -148,11 +146,9 @@ public class MavenProjectWizard extends AbstractMavenProjectWizard implements IN } }); - archetypePage.addArchetypeSelectionListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent selectionchangedevent) { - parametersPage.setArchetype(archetypePage.getArchetype()); - getContainer().updateButtons(); - } + archetypePage.addArchetypeSelectionListener(selectionchangedevent -> { + parametersPage.setArchetype(archetypePage.getArchetype()); + getContainer().updateButtons(); }); // locationPage.addProjectNameListener(new ModifyListener() { @@ -251,12 +247,8 @@ public class MavenProjectWizard extends AbstractMavenProjectWizard implements IN public void done(IJobChangeEvent event) { final IStatus result = event.getResult(); if(!result.isOK()) { - Display.getDefault().asyncExec(new Runnable() { - public void run() { - MessageDialog.openError(getShell(), // - NLS.bind(Messages.wizardProjectJobFailed, projectName), result.getMessage()); - } - }); + Display.getDefault().asyncExec(() -> MessageDialog.openError(getShell(), // + NLS.bind(Messages.wizardProjectJobFailed, projectName), result.getMessage())); } MappingDiscoveryJob discoveryJob = new MappingDiscoveryJob(job.getCreatedProjects()); diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java index aa5ecdf1..ab3a370e 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java @@ -34,18 +34,14 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.IJobChangeEvent; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.core.runtime.jobs.JobChangeAdapter; -import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.viewers.ComboViewer; import org.eclipse.jface.viewers.IElementComparer; -import org.eclipse.jface.viewers.IOpenListener; import org.eclipse.jface.viewers.ISelection; 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.OpenEvent; -import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.Viewer; @@ -114,31 +110,27 @@ public class MavenProjectWizardArchetypePage extends AbstractMavenWizardPage imp private static final String ALL_CATALOGS = org.eclipse.m2e.core.ui.internal.Messages.MavenProjectWizardArchetypePage_all; - public static final Comparator<Archetype> ARCHETYPE_COMPARATOR = new Comparator<Archetype>() { - - public int compare(Archetype a1, Archetype a2) { - String g1 = a1.getGroupId(); - String g2 = a2.getGroupId(); - int res = g1.compareTo(g2); - if(res != 0) { - return res; - } - - String i1 = a1.getArtifactId(); - String i2 = a2.getArtifactId(); - res = i1.compareTo(i2); - if(res != 0) { - return res; - } + public static final Comparator<Archetype> ARCHETYPE_COMPARATOR = (a1, a2) -> { + String g1 = a1.getGroupId(); + String g2 = a2.getGroupId(); + int res = g1.compareTo(g2); + if(res != 0) { + return res; + } - String v1 = a1.getVersion(); - String v2 = a2.getVersion(); - if(v1 == null) { - return v2 == null ? 0 : -1; - } - return v1.compareTo(v2); + String i1 = a1.getArtifactId(); + String i2 = a2.getArtifactId(); + res = i1.compareTo(i2); + if(res != 0) { + return res; } + String v1 = a1.getVersion(); + String v2 = a2.getVersion(); + if(v1 == null) { + return v2 == null ? 0 : -1; + } + return v1.compareTo(v2); }; private static final boolean DEFAULT_SHOW_LAST_VERSION = true; @@ -247,40 +239,38 @@ public class MavenProjectWizardArchetypePage extends AbstractMavenWizardPage imp } }); - catalogsComboViewer.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - ISelection selection = event.getSelection(); - boolean loadAll = false; - //hide previous archetypes when switching catalog - if(selection instanceof IStructuredSelection) { - Object factory = ((IStructuredSelection) selection).getFirstElement(); - ArchetypeCatalogFactory newCatalogFactory = null; - if(factory instanceof ArchetypeCatalogFactory) { - newCatalogFactory = (ArchetypeCatalogFactory) factory; - } - if(factory != null && newCatalogFactory == null) { - loadAll = true; - } else if(Objects.equals(catalogFactory, newCatalogFactory) && viewer.getInput() != null) { - return; - } - catalogFactory = newCatalogFactory; - viewer.setInput(null); - reloadViewer(); - } else { - loadAll = true; - } - if(loadAll) { - catalogFactory = null; - viewer.setInput(null); - loadArchetypes(null, null, null); + catalogsComboViewer.addSelectionChangedListener(event -> { + ISelection selection = event.getSelection(); + boolean loadAll = false; + //hide previous archetypes when switching catalog + if(selection instanceof IStructuredSelection) { + Object factory = ((IStructuredSelection) selection).getFirstElement(); + ArchetypeCatalogFactory newCatalogFactory = null; + if(factory instanceof ArchetypeCatalogFactory) { + newCatalogFactory = (ArchetypeCatalogFactory) factory; } - //remember what was switched to here - if(dialogSettings != null) { - if(catalogFactory != null) - dialogSettings.put(KEY_CATALOG, catalogFactory.getId()); - else - dialogSettings.put(KEY_CATALOG, ALL_CATALOGS); + if(factory != null && newCatalogFactory == null) { + loadAll = true; + } else if(Objects.equals(catalogFactory, newCatalogFactory) && viewer.getInput() != null) { + return; } + catalogFactory = newCatalogFactory; + viewer.setInput(null); + reloadViewer(); + } else { + loadAll = true; + } + if(loadAll) { + catalogFactory = null; + viewer.setInput(null); + loadArchetypes(null, null, null); + } + //remember what was switched to here + if(dialogSettings != null) { + if(catalogFactory != null) + dialogSettings.put(KEY_CATALOG, catalogFactory.getId()); + else + dialogSettings.put(KEY_CATALOG, ALL_CATALOGS); } }); @@ -360,11 +350,7 @@ public class MavenProjectWizardArchetypePage extends AbstractMavenWizardPage imp } }); - filterText.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - clearToolItem.setEnabled(filterText.getText().length() > 0); - } - }); + filterText.addModifyListener(e -> clearToolItem.setEnabled(filterText.getText().length() > 0)); SashForm sashForm = new SashForm(parent, SWT.VERTICAL); GridData gd_sashForm = new GridData(SWT.FILL, SWT.FILL, false, true, 3, 1); @@ -443,34 +429,30 @@ public class MavenProjectWizardArchetypePage extends AbstractMavenWizardPage imp } }); - viewer.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - Archetype archetype = getArchetype(); - if(archetype != null) { - String repositoryUrl = archetype.getRepository(); - String description = archetype.getDescription(); - - String text = description == null ? "" : description; //$NON-NLS-1$ - text = text.replaceAll("\n", "").replaceAll("\\s{2,}", " "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + viewer.addSelectionChangedListener(event -> { + Archetype archetype = getArchetype(); + if(archetype != null) { + String repositoryUrl = archetype.getRepository(); + String description = archetype.getDescription(); - if(repositoryUrl != null) { - text += text.length() > 0 ? "\n" + repositoryUrl : repositoryUrl; //$NON-NLS-1$ - } + String text = description == null ? "" : description; //$NON-NLS-1$ + text = text.replaceAll("\n", "").replaceAll("\\s{2,}", " "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - descriptionText.setText(text); - setPageComplete(true); - } else { - descriptionText.setText(""); //$NON-NLS-1$ - setPageComplete(false); + if(repositoryUrl != null) { + text += text.length() > 0 ? "\n" + repositoryUrl : repositoryUrl; //$NON-NLS-1$ } + + descriptionText.setText(text); + setPageComplete(true); + } else { + descriptionText.setText(""); //$NON-NLS-1$ + setPageComplete(false); } }); - viewer.addOpenListener(new IOpenListener() { - public void open(OpenEvent openevent) { - if(canFlipToNextPage()) { - getContainer().showPage(getNextPage()); - } + viewer.addOpenListener(openevent -> { + if(canFlipToNextPage()) { + getContainer().showPage(getNextPage()); } }); @@ -645,22 +627,14 @@ public class MavenProjectWizardArchetypePage extends AbstractMavenWizardPage imp error = null; } - Display.getDefault().asyncExec(new Runnable() { - public void run() { - setErrorMessage(error); - } - }); + Display.getDefault().asyncExec(() -> setErrorMessage(error)); TreeSet<Archetype> archs = new TreeSet<Archetype>(ARCHETYPE_COMPARATOR); if(catalogArchetypes != null) { archs.addAll(catalogArchetypes); } archetypes = archs; - Display.getDefault().asyncExec(new Runnable() { - public void run() { - updateViewer(groupId, artifactId, version); - } - }); + Display.getDefault().asyncExec(() -> updateViewer(groupId, artifactId, version)); } }); job.schedule(); @@ -774,11 +748,7 @@ public class MavenProjectWizardArchetypePage extends AbstractMavenWizardPage imp versions.add(v); } - final Comparator<ArtifactVersion> comparator = new Comparator<ArtifactVersion>() { - public int compare(ArtifactVersion v1, ArtifactVersion v2) { - return v2.compareTo(v1); - } - }; + final Comparator<ArtifactVersion> comparator = (v1, v2) -> v2.compareTo(v1); for(List<ArtifactVersion> versions : archetypeVersions.values()) { Collections.sort(versions, comparator); @@ -818,102 +788,92 @@ public class MavenProjectWizardArchetypePage extends AbstractMavenWizardPage imp } final String archetypeName = archetypeGroupId + ":" + archetypeArtifactId + ":" + archetypeVersion; //$NON-NLS-1$ //$NON-NLS-2$ try { - getContainer().run(true, true, new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InterruptedException { - monitor.beginTask(org.eclipse.m2e.core.ui.internal.Messages.MavenProjectWizardArchetypePage_task_downloading - + archetypeName, IProgressMonitor.UNKNOWN); - - try { - final IMaven maven = MavenPlugin.getMaven(); - - final List<ArtifactRepository> remoteRepositories; - if(repositoryUrl.length() == 0) { - remoteRepositories = maven.getArtifactRepositories(); // XXX should use ArchetypeManager.getArchetypeRepositories() - } else { - //Use id = archetypeArtifactId+"-repo" to enable mirror/proxy authentication - //see http://maven.apache.org/archetype/maven-archetype-plugin/faq.html - ArtifactRepository repository = maven.createArtifactRepository(archetypeArtifactId + "-repo", //$NON-NLS-1$ - repositoryUrl); - - remoteRepositories = Collections.singletonList(repository); - } + getContainer().run(true, true, monitor -> { + monitor.beginTask( + org.eclipse.m2e.core.ui.internal.Messages.MavenProjectWizardArchetypePage_task_downloading + archetypeName, + IProgressMonitor.UNKNOWN); + + try { + final IMaven maven = MavenPlugin.getMaven(); - monitor.subTask(org.eclipse.m2e.core.ui.internal.Messages.MavenProjectWizardArchetypePage_task_resolving); - Artifact pomArtifact = maven.resolve(archetypeGroupId, archetypeArtifactId, archetypeVersion, "pom", null, //$NON-NLS-1$ + final List<ArtifactRepository> remoteRepositories; + if(repositoryUrl.length() == 0) { + remoteRepositories = maven.getArtifactRepositories(); // XXX should use ArchetypeManager.getArchetypeRepositories() + } else { + //Use id = archetypeArtifactId+"-repo" to enable mirror/proxy authentication + //see http://maven.apache.org/archetype/maven-archetype-plugin/faq.html + ArtifactRepository repository = maven.createArtifactRepository(archetypeArtifactId + "-repo", //$NON-NLS-1$ + repositoryUrl); + + remoteRepositories = Collections.singletonList(repository); + } + + monitor.subTask(org.eclipse.m2e.core.ui.internal.Messages.MavenProjectWizardArchetypePage_task_resolving); + Artifact pomArtifact = maven.resolve(archetypeGroupId, archetypeArtifactId, archetypeVersion, "pom", null, //$NON-NLS-1$ + remoteRepositories, monitor); + monitor.worked(1); + if(monitor.isCanceled()) { + throw new InterruptedException(); + } + + File pomFile = pomArtifact.getFile(); + if(pomFile.exists()) { + monitor.subTask(org.eclipse.m2e.core.ui.internal.Messages.MavenProjectWizardArchetypePage_task_resolving2); + Artifact jarArtifact = maven.resolve(archetypeGroupId, archetypeArtifactId, archetypeVersion, "jar", null, //$NON-NLS-1$ remoteRepositories, monitor); monitor.worked(1); if(monitor.isCanceled()) { throw new InterruptedException(); } - File pomFile = pomArtifact.getFile(); - if(pomFile.exists()) { - monitor - .subTask(org.eclipse.m2e.core.ui.internal.Messages.MavenProjectWizardArchetypePage_task_resolving2); - Artifact jarArtifact = maven.resolve(archetypeGroupId, archetypeArtifactId, archetypeVersion, "jar", null, //$NON-NLS-1$ - remoteRepositories, monitor); - monitor.worked(1); - if(monitor.isCanceled()) { - throw new InterruptedException(); - } - - File jarFile = jarArtifact.getFile(); - - monitor.subTask(org.eclipse.m2e.core.ui.internal.Messages.MavenProjectWizardArchetypePage_task_reading); - monitor.worked(1); - if(monitor.isCanceled()) { - throw new InterruptedException(); - } - - monitor.subTask(org.eclipse.m2e.core.ui.internal.Messages.MavenProjectWizardArchetypePage_task_indexing); - IndexManager indexManager = MavenPlugin.getIndexManager(); - IMutableIndex localIndex = indexManager.getLocalIndex(); - localIndex.addArtifact(jarFile, new ArtifactKey(pomArtifact)); - - //save out the archetype - //TODO move this logic out of UI code! - Archetype archetype = new Archetype(); - archetype.setGroupId(archetypeGroupId); - archetype.setArtifactId(archetypeArtifactId); - archetype.setVersion(archetypeVersion); - archetype.setRepository(repositoryUrl); - org.apache.maven.archetype.ArchetypeManager archetyper = MavenPluginActivator.getDefault() - .getArchetypeManager().getArchetyper(); - archetyper.updateLocalCatalog(archetype); - - archetypesCache.clear(); - - loadArchetypes(archetypeGroupId, archetypeArtifactId, archetypeVersion); - } else { - final Artifact pom = pomArtifact; - //the user tried to add an archetype that couldn't be resolved on the server - getShell().getDisplay().asyncExec(new Runnable() { - public void run() { - setErrorMessage( - NLS.bind(org.eclipse.m2e.core.ui.internal.Messages.MavenProjectWizardArchetypePage_error_resolve, - pom.toString())); - } - }); + File jarFile = jarArtifact.getFile(); + + monitor.subTask(org.eclipse.m2e.core.ui.internal.Messages.MavenProjectWizardArchetypePage_task_reading); + monitor.worked(1); + if(monitor.isCanceled()) { + throw new InterruptedException(); } - } catch(InterruptedException ex) { - throw ex; + monitor.subTask(org.eclipse.m2e.core.ui.internal.Messages.MavenProjectWizardArchetypePage_task_indexing); + IndexManager indexManager = MavenPlugin.getIndexManager(); + IMutableIndex localIndex = indexManager.getLocalIndex(); + localIndex.addArtifact(jarFile, new ArtifactKey(pomArtifact)); + + //save out the archetype + //TODO move this logic out of UI code! + Archetype archetype = new Archetype(); + archetype.setGroupId(archetypeGroupId); + archetype.setArtifactId(archetypeArtifactId); + archetype.setVersion(archetypeVersion); + archetype.setRepository(repositoryUrl); + org.apache.maven.archetype.ArchetypeManager archetyper = MavenPluginActivator.getDefault() + .getArchetypeManager().getArchetyper(); + archetyper.updateLocalCatalog(archetype); + + archetypesCache.clear(); + + loadArchetypes(archetypeGroupId, archetypeArtifactId, archetypeVersion); + } else { + final Artifact pom = pomArtifact; + //the user tried to add an archetype that couldn't be resolved on the server + getShell().getDisplay() + .asyncExec(() -> setErrorMessage( + NLS.bind(org.eclipse.m2e.core.ui.internal.Messages.MavenProjectWizardArchetypePage_error_resolve, + pom.toString()))); + } - } catch(final Exception ex) { - final String msg = NLS.bind( - org.eclipse.m2e.core.ui.internal.Messages.MavenProjectWizardArchetypePage_error_resolve2, - archetypeName); - log.error(msg, ex); - getShell().getDisplay().asyncExec(new Runnable() { - public void run() { - setErrorMessage(msg + "\n" + ex.toString()); //$NON-NLS-1$ - } - }); + } catch(InterruptedException ex1) { + throw ex1; - } finally { - monitor.done(); + } catch(final Exception ex2) { + final String msg = NLS.bind( + org.eclipse.m2e.core.ui.internal.Messages.MavenProjectWizardArchetypePage_error_resolve2, archetypeName); + log.error(msg, ex2); + getShell().getDisplay().asyncExec(() -> setErrorMessage(msg + "\n" + ex2.toString())); + + } finally { + monitor.done(); - } } }); @@ -1056,19 +1016,17 @@ public class MavenProjectWizardArchetypePage extends AbstractMavenWizardPage imp //reload the table when index updating finishes //try to preserve selection in case this is a rebuild protected void reloadViewer() { - Display.getDefault().asyncExec(new Runnable() { - public void run() { - if(isCurrentPage()) { - StructuredSelection sel = (StructuredSelection) viewer.getSelection(); - Archetype selArchetype = null; - if(sel != null && sel.getFirstElement() != null) { - selArchetype = (Archetype) sel.getFirstElement(); - } - if(selArchetype != null) { - loadArchetypes(selArchetype.getGroupId(), selArchetype.getArtifactId(), selArchetype.getVersion()); - } else { - loadArchetypes("org.apache.maven.archetypes", "maven-archetype-quickstart", "1.0"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } + Display.getDefault().asyncExec(() -> { + if(isCurrentPage()) { + StructuredSelection sel = (StructuredSelection) viewer.getSelection(); + Archetype selArchetype = null; + if(sel != null && sel.getFirstElement() != null) { + selArchetype = (Archetype) sel.getFirstElement(); + } + if(selArchetype != null) { + loadArchetypes(selArchetype.getGroupId(), selArchetype.getArtifactId(), selArchetype.getVersion()); + } else { + loadArchetypes("org.apache.maven.archetypes", "maven-archetype-quickstart", "1.0"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } } }); diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypeParametersPage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypeParametersPage.java index 8e78361c..d7e4b87d 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypeParametersPage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypeParametersPage.java @@ -38,8 +38,6 @@ import org.eclipse.jface.viewers.TextCellEditor; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.osgi.util.NLS; 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; @@ -141,11 +139,7 @@ public class MavenProjectWizardArchetypeParametersPage extends AbstractMavenWiza validate(); createAdvancedSettings(composite, new GridData(SWT.FILL, SWT.TOP, false, false, 3, 1)); - resolverConfigurationComponent.setModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - validate(); - } - }); + resolverConfigurationComponent.setModifyListener(e -> validate()); setControl(composite); @@ -164,11 +158,9 @@ public class MavenProjectWizardArchetypeParametersPage extends AbstractMavenWiza groupIdCombo.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1)); addFieldWithHistory("groupId", groupIdCombo); //$NON-NLS-1$ groupIdCombo.setData("name", "groupId"); //$NON-NLS-1$ //$NON-NLS-2$ - groupIdCombo.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - updateJavaPackage(); - validate(); - } + groupIdCombo.addModifyListener(e -> { + updateJavaPackage(); + validate(); }); Label artifactIdLabel = new Label(parent, SWT.NONE); @@ -178,11 +170,9 @@ public class MavenProjectWizardArchetypeParametersPage extends AbstractMavenWiza artifactIdCombo.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 2, 1)); addFieldWithHistory("artifactId", artifactIdCombo); //$NON-NLS-1$ artifactIdCombo.setData("name", "artifactId"); //$NON-NLS-1$ //$NON-NLS-2$ - artifactIdCombo.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - updateJavaPackage(); - validate(); - } + artifactIdCombo.addModifyListener(e -> { + updateJavaPackage(); + validate(); }); Label versionLabel = new Label(parent, SWT.NONE); @@ -194,11 +184,7 @@ public class MavenProjectWizardArchetypeParametersPage extends AbstractMavenWiza versionCombo.setLayoutData(gd_versionCombo); versionCombo.setText(DEFAULT_VERSION); addFieldWithHistory("version", versionCombo); //$NON-NLS-1$ - versionCombo.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - validate(); - } - }); + versionCombo.addModifyListener(e -> validate()); Label packageLabel = new Label(parent, SWT.NONE); packageLabel.setText(Messages.artifactComponentPackage); @@ -207,13 +193,11 @@ public class MavenProjectWizardArchetypeParametersPage extends AbstractMavenWiza packageCombo.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 2, 1)); packageCombo.setData("name", "package"); //$NON-NLS-1$ //$NON-NLS-2$ addFieldWithHistory("package", packageCombo); //$NON-NLS-1$ - packageCombo.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - if(!packageCustomized && !packageCombo.getText().equals(getDefaultJavaPackage())) { - packageCustomized = true; - } - validate(); + packageCombo.addModifyListener(e -> { + if(!packageCustomized && !packageCombo.getText().equals(getDefaultJavaPackage())) { + packageCustomized = true; } + validate(); }); } diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArtifactPage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArtifactPage.java index 9e22ce6c..ce10e6be 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArtifactPage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArtifactPage.java @@ -17,7 +17,6 @@ import java.util.Map; import org.eclipse.core.runtime.IStatus; 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; @@ -129,11 +128,7 @@ public class MavenProjectWizardArtifactPage extends AbstractMavenWizardPage { WidthGroup widthGroup = new WidthGroup(); container.addControlListener(widthGroup); - ModifyListener modifyingListener = new ModifyListener() { - public void modifyText(ModifyEvent e) { - validate(); - } - }; + ModifyListener modifyingListener = e -> validate(); artifactComponent = new MavenArtifactComponent(container, SWT.NONE); artifactComponent.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); @@ -162,11 +157,7 @@ public class MavenProjectWizardArtifactPage extends AbstractMavenWizardPage { }); createAdvancedSettings(container, new GridData(SWT.FILL, SWT.TOP, false, false, 2, 1)); - resolverConfigurationComponent.setModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - validate(); - } - }); + resolverConfigurationComponent.setModifyListener(e -> validate()); addFieldWithHistory("groupId", artifactComponent.getGroupIdCombo()); //$NON-NLS-1$ addFieldWithHistory("artifactId", artifactComponent.getArtifactIdCombo()); //$NON-NLS-1$ diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardLocationPage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardLocationPage.java index 7c0128a1..7ff53244 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardLocationPage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardLocationPage.java @@ -20,8 +20,6 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; 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; @@ -123,11 +121,7 @@ public class MavenProjectWizardLocationPage extends AbstractMavenWizardPage { locationCombo = new Combo(container, SWT.NONE); GridData locationComboData = new GridData(SWT.FILL, SWT.CENTER, true, false); locationCombo.setLayoutData(locationComboData); - locationCombo.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - validate(); - } - }); + locationCombo.addModifyListener(e -> validate()); locationCombo.setEnabled(false); addFieldWithHistory("location", locationCombo); //$NON-NLS-1$ diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/ResolverConfigurationComponent.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/ResolverConfigurationComponent.java index 99f23c62..07fd0595 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/ResolverConfigurationComponent.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/ResolverConfigurationComponent.java @@ -12,7 +12,6 @@ package org.eclipse.m2e.core.ui.internal.wizards; 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; @@ -101,11 +100,7 @@ public class ResolverConfigurationComponent extends ExpandableComposite { profiles = new Text(advancedComposite, SWT.BORDER); profiles.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); - profiles.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - resolverConfiguration.setSelectedProfiles(profiles.getText()); - } - }); + profiles.addModifyListener(e -> resolverConfiguration.setSelectedProfiles(profiles.getText())); if(enableProjectNameTemplate) { Label templateLabel = new Label(advancedComposite, SWT.NONE); @@ -116,11 +111,7 @@ public class ResolverConfigurationComponent extends ExpandableComposite { template.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); template.setToolTipText(Messages.resolverConfigurationTemplateDescription); template.setItems(DEFAULT_NAME_TEMPLATES); - template.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - propectImportConfiguration.setProjectNameTemplate(template.getText()); - } - }); + template.addModifyListener(e -> propectImportConfiguration.setProjectNameTemplate(template.getText())); } loadData(); |