diff options
author | Lars Vogel | 2020-02-11 16:20:33 +0000 |
---|---|---|
committer | Lars Vogel | 2020-02-11 16:20:33 +0000 |
commit | 641acbdd37d0a0c9773b3c8f4a686efd557b3a81 (patch) | |
tree | 495aa4cb0f15f6478dc789c5a237f0707f74b94d | |
parent | 9cffce2ed07f6f04ae7c595543dc07ec1fbe1fcb (diff) | |
download | eclipse.platform.debug-641acbdd37d0a0c9773b3c8f4a686efd557b3a81.tar.gz eclipse.platform.debug-641acbdd37d0a0c9773b3c8f4a686efd557b3a81.tar.xz eclipse.platform.debug-641acbdd37d0a0c9773b3c8f4a686efd557b3a81.zip |
Clean-up use lambdas and method references in ui.consoleI20200212-1420
Using the JDT cleanup action ->
- Use lambda where possible
- Simplify lambda expression and method reference syntax
Change-Id: Icdce7db08c100cf4eda0e9ebabf20afbe64ba36f
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
3 files changed, 24 insertions, 49 deletions
diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/console/TextConsolePage.java b/org.eclipse.ui.console/src/org/eclipse/ui/console/TextConsolePage.java index 01a0b8111..5eea534ec 100644 --- a/org.eclipse.ui.console/src/org/eclipse/ui/console/TextConsolePage.java +++ b/org.eclipse.ui.console/src/org/eclipse/ui/console/TextConsolePage.java @@ -22,7 +22,6 @@ import java.util.ResourceBundle; import org.eclipse.core.runtime.IAdaptable; 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; @@ -32,11 +31,9 @@ import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IFindReplaceTarget; import org.eclipse.jface.text.ITextListener; import org.eclipse.jface.text.ITextOperationTarget; -import org.eclipse.jface.text.TextEvent; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Menu; @@ -83,27 +80,19 @@ public class TextConsolePage implements IPageBookViewPage, IPropertyChangeListen protected ClearOutputAction fClearOutputAction; // text selection listener, used to update selection dependent actions on selection changes - private ISelectionChangedListener selectionChangedListener = new ISelectionChangedListener() { - @Override - public void selectionChanged(SelectionChangedEvent event) { - updateSelectionDependentActions(); - } - }; + private ISelectionChangedListener selectionChangedListener = event -> updateSelectionDependentActions(); // updates the find replace action and the clear action if the document length is > 0 - private ITextListener textListener = new ITextListener() { - @Override - public void textChanged(TextEvent event) { - IUpdate findReplace = (IUpdate)fGlobalActions.get(ActionFactory.FIND.getId()); - if (findReplace != null) { - findReplace.update(); - } + private ITextListener textListener = event -> { + IUpdate findReplace = (IUpdate)fGlobalActions.get(ActionFactory.FIND.getId()); + if (findReplace != null) { + findReplace.update(); + } - if (fClearOutputAction != null) { - IDocument doc = fViewer.getDocument(); - if(doc != null) { - fClearOutputAction.setEnabled(doc.getLength() > 0); - } + if (fClearOutputAction != null) { + IDocument doc = fViewer.getDocument(); + if(doc != null) { + fClearOutputAction.setEnabled(doc.getLength() > 0); } } }; @@ -162,12 +151,7 @@ public class TextConsolePage implements IPageBookViewPage, IPropertyChangeListen } fMenuManager= new MenuManager("#ContextMenu", id); //$NON-NLS-1$ fMenuManager.setRemoveAllWhenShown(true); - fMenuManager.addMenuListener(new IMenuListener() { - @Override - public void menuAboutToShow(IMenuManager m) { - contextMenuAboutToShow(m); - } - }); + fMenuManager.addMenuListener(m -> contextMenuAboutToShow(m)); Menu menu = fMenuManager.createContextMenu(getControl()); getControl().setMenu(menu); diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IOConsolePage.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IOConsolePage.java index 9f6fe30cc..0d27cb25c 100644 --- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IOConsolePage.java +++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IOConsolePage.java @@ -17,7 +17,6 @@ package org.eclipse.ui.internal.console; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.util.IPropertyChangeListener; -import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.actions.ActionFactory; import org.eclipse.ui.console.IConsoleConstants; @@ -47,13 +46,10 @@ public class IOConsolePage extends TextConsolePage { super(console, view); fView = view; - fPropertyChangeListener = new IPropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent event) { - String property = event.getProperty(); - if (property.equals(IConsoleConstants.P_CONSOLE_OUTPUT_COMPLETE)) { - setReadOnly(); - } + fPropertyChangeListener = event -> { + String property = event.getProperty(); + if (property.equals(IConsoleConstants.P_CONSOLE_OUTPUT_COMPLETE)) { + setReadOnly(); } }; console.addPropertyChangeListener(fPropertyChangeListener); diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/OpenConsoleAction.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/OpenConsoleAction.java index 1a25fddf3..1f5be00c3 100644 --- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/OpenConsoleAction.java +++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/OpenConsoleAction.java @@ -14,7 +14,6 @@ package org.eclipse.ui.internal.console; import java.util.Arrays; -import java.util.Comparator; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.action.Action; @@ -52,20 +51,16 @@ public class OpenConsoleAction extends Action implements IMenuCreator { private ConsoleFactoryExtension[] getSortedFactories() { ConsoleFactoryExtension[] factoryExtensions = ((ConsoleManager) ConsolePlugin.getDefault().getConsoleManager()).getConsoleFactoryExtensions(); - Arrays.sort(factoryExtensions, new Comparator<ConsoleFactoryExtension>() { - - @Override - public int compare(ConsoleFactoryExtension e1, ConsoleFactoryExtension e2) { - if (e1.isNewConsoleExtenson()) { - return -1; - } - if (e2.isNewConsoleExtenson()) { - return 1; - } - String first = e1.getLabel(); - String second = e2.getLabel(); - return first.compareTo(second); + Arrays.sort(factoryExtensions, (e1, e2) -> { + if (e1.isNewConsoleExtenson()) { + return -1; + } + if (e2.isNewConsoleExtenson()) { + return 1; } + String first = e1.getLabel(); + String second = e2.getLabel(); + return first.compareTo(second); }); return factoryExtensions; } |