diff options
| author | Lars Vogel | 2020-07-20 09:09:08 +0000 |
|---|---|---|
| committer | Jeff Johnston | 2020-07-23 18:25:11 +0000 |
| commit | 9c3704c1e206878551337f43f2c2d6bc73503dda (patch) | |
| tree | b93a2a3a497ec78598742fd1f0863d45e23a987c | |
| parent | 23b866d8e1f8dd42115cc8952524c0fca8e34974 (diff) | |
| download | eclipse.jdt.ui-9c3704c1e206878551337f43f2c2d6bc73503dda.tar.gz eclipse.jdt.ui-9c3704c1e206878551337f43f2c2d6bc73503dda.tar.xz eclipse.jdt.ui-9c3704c1e206878551337f43f2c2d6bc73503dda.zip | |
Bug 564416 - Use lambdas and method references cleanup on JDT UI code
For multiple internal packages: preferences, text, typehierarchy,
viewsupport
Change-Id: If952f229c81a446efd97057d9d8295d607153a88
43 files changed, 282 insertions, 648 deletions
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/cleanup/CleanUpConfigurationBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/cleanup/CleanUpConfigurationBlock.java index d3ae59b190..72b38b3645 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/cleanup/CleanUpConfigurationBlock.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/cleanup/CleanUpConfigurationBlock.java @@ -17,8 +17,6 @@ package org.eclipse.jdt.internal.ui.preferences.cleanup; import java.util.Hashtable; import java.util.List; import java.util.Map; -import java.util.Observable; -import java.util.Observer; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; @@ -51,8 +49,6 @@ import org.eclipse.jdt.internal.ui.preferences.formatter.ProfileManager; import org.eclipse.jdt.internal.ui.preferences.formatter.ProfileManager.CustomProfile; import org.eclipse.jdt.internal.ui.preferences.formatter.ProfileManager.Profile; import org.eclipse.jdt.internal.ui.preferences.formatter.ProfileStore; -import org.eclipse.jdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.jdt.internal.ui.wizards.dialogfields.IDialogFieldListener; import org.eclipse.jdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField; @@ -117,21 +113,16 @@ public class CleanUpConfigurationBlock extends ProfileConfigurationBlock { cleanUpListBlock.setLayoutData(gridData); cleanUpListBlock.setText(getSelectedCleanUpsInfo(cleanUps)); - profileManager.addObserver(new Observer() { - - @Override - public void update(Observable o, Object arg) { - final int value= ((Integer)arg).intValue(); - switch (value) { - case ProfileManager.PROFILE_CREATED_EVENT: - case ProfileManager.PROFILE_DELETED_EVENT: - case ProfileManager.SELECTION_CHANGED_EVENT: - case ProfileManager.SETTINGS_CHANGED_EVENT: - fill(profileManager.getSelected().getSettings(), sharedSettings); - cleanUpListBlock.setText(getSelectedCleanUpsInfo(cleanUps)); - } - } - + profileManager.addObserver((o, arg) -> { + final int value= ((Integer)arg).intValue(); + switch (value) { + case ProfileManager.PROFILE_CREATED_EVENT: + case ProfileManager.PROFILE_DELETED_EVENT: + case ProfileManager.SELECTION_CHANGED_EVENT: + case ProfileManager.SETTINGS_CHANGED_EVENT: + fill(profileManager.getSelected().getSettings(), sharedSettings); + cleanUpListBlock.setText(getSelectedCleanUpsInfo(cleanUps)); + } }); } @@ -190,12 +181,7 @@ public class CleanUpConfigurationBlock extends ProfileConfigurationBlock { if (showWizard) fShowCleanUpWizardDialogField.setSelection(true); - fShowCleanUpWizardDialogField.setDialogFieldListener(new IDialogFieldListener() { - @Override - public void dialogFieldChanged(DialogField field) { - doShowCleanUpWizard(fShowCleanUpWizardDialogField.isSelected()); - } - }); + fShowCleanUpWizardDialogField.setDialogFieldListener(field -> doShowCleanUpWizard(fShowCleanUpWizardDialogField.isSelected())); return composite; } @@ -219,12 +205,7 @@ public class CleanUpConfigurationBlock extends ProfileConfigurationBlock { boolean showWizard= DefaultScope.INSTANCE.getNode(JavaUI.ID_PLUGIN).getBoolean(CleanUpConstants.SHOW_CLEAN_UP_WIZARD, true); fShowCleanUpWizardDialogField.setDialogFieldListener(null); fShowCleanUpWizardDialogField.setSelection(showWizard); - fShowCleanUpWizardDialogField.setDialogFieldListener(new IDialogFieldListener() { - @Override - public void dialogFieldChanged(DialogField field) { - doShowCleanUpWizard(fShowCleanUpWizardDialogField.isSelected()); - } - }); + fShowCleanUpWizardDialogField.setDialogFieldListener(field -> doShowCleanUpWizard(fShowCleanUpWizardDialogField.isSelected())); } @Override diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/cleanup/CleanUpTabPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/cleanup/CleanUpTabPage.java index afe63dde62..f1b04b1392 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/cleanup/CleanUpTabPage.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/cleanup/CleanUpTabPage.java @@ -14,8 +14,6 @@ package org.eclipse.jdt.internal.ui.preferences.cleanup; import java.util.Map; -import java.util.Observable; -import java.util.Observer; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; @@ -104,14 +102,11 @@ public abstract class CleanUpTabPage extends ModifyDialogTabPage implements ICle protected void registerPreference(final CheckboxPreference preference) { fCount++; - preference.addObserver(new Observer() { - @Override - public void update(Observable o, Object arg) { - if (preference.getChecked()) { - setSelectedCleanUpCount(fSelectedCount + 1); - } else { - setSelectedCleanUpCount(fSelectedCount - 1); - } + preference.addObserver((o, arg) -> { + if (preference.getChecked()) { + setSelectedCleanUpCount(fSelectedCount + 1); + } else { + setSelectedCleanUpCount(fSelectedCount - 1); } }); if (preference.getChecked()) { @@ -144,29 +139,23 @@ public abstract class CleanUpTabPage extends ModifyDialogTabPage implements ICle for (int i= 0; i < slaves.length; i++) { final CheckboxPreference slave= slaves[i]; for (CheckboxPreference subSlave : subSlaves[i]) { - master.addObserver(new Observer() { - @Override - public void update(Observable o, Object arg) { - boolean enabled= master.getChecked() && slave.getChecked(); - subSlave.setEnabled(enabled); - } + master.addObserver((o, arg) -> { + boolean enabled= master.getChecked() && slave.getChecked(); + subSlave.setEnabled(enabled); }); } } } - master.addObserver(new Observer() { - @Override - public void update(Observable o, Object arg) { - boolean masterChecked= master.getChecked(); - for (int i= 0; i < slaves.length; i++) { - if (slaves[i].getChecked()) { - setSelectedCleanUpCount(fSelectedCount + (masterChecked ? 1 : -1)); - if (subSlaves != null) { - for (CheckboxPreference subSlave : subSlaves[i]) { - if (subSlave.getChecked()) { - setSelectedCleanUpCount(fSelectedCount + (masterChecked ? 1 : -1)); - } + master.addObserver((o, arg) -> { + boolean masterChecked= master.getChecked(); + for (int i= 0; i < slaves.length; i++) { + if (slaves[i].getChecked()) { + setSelectedCleanUpCount(fSelectedCount + (masterChecked ? 1 : -1)); + if (subSlaves != null) { + for (CheckboxPreference subSlave : subSlaves[i]) { + if (subSlave.getChecked()) { + setSelectedCleanUpCount(fSelectedCount + (masterChecked ? 1 : -1)); } } } @@ -175,12 +164,7 @@ public abstract class CleanUpTabPage extends ModifyDialogTabPage implements ICle }); for (CheckboxPreference slave : slaves) { - slave.addObserver(new Observer() { - @Override - public void update(Observable o, Object arg) { - setSelectedCleanUpCount(fSelectedCount + (slave.getChecked() ? 1 : -1)); - } - }); + slave.addObserver((o, arg) -> setSelectedCleanUpCount(fSelectedCount + (slave.getChecked() ? 1 : -1))); } if (master.getChecked()) { @@ -193,14 +177,11 @@ public abstract class CleanUpTabPage extends ModifyDialogTabPage implements ICle } private void internalRegisterSlavePreference(final CheckboxPreference master, final ButtonPreference[] slaves) { - master.addObserver( new Observer() { - @Override - public void update(Observable o, Object arg) { - for (ButtonPreference slave : slaves) { - slave.setEnabled(master.getChecked()); - } - } - }); + master.addObserver( (o, arg) -> { + for (ButtonPreference slave : slaves) { + slave.setEnabled(master.getChecked()); + } + }); for (ButtonPreference slave : slaves) { slave.setEnabled(master.getChecked()); diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/cleanup/CodeFormatingTabPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/cleanup/CodeFormatingTabPage.java index dd7a6a274a..8195f41982 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/cleanup/CodeFormatingTabPage.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/cleanup/CodeFormatingTabPage.java @@ -15,8 +15,6 @@ package org.eclipse.jdt.internal.ui.preferences.cleanup; import java.util.Map; -import java.util.Observable; -import java.util.Observer; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; @@ -80,12 +78,9 @@ public final class CodeFormatingTabPage extends AbstractCleanUpTabPage { if (!isSaveAction()) { final CheckboxPreference format= createCheckboxPref(group, numColumns, CleanUpMessages.CodeFormatingTabPage_CheckboxName_FormatSourceCode, CleanUpConstants.FORMAT_SOURCE_CODE, CleanUpModifyDialog.FALSE_TRUE); registerPreference(format); - format.addObserver(new Observer() { - @Override - public void update(Observable o, Object arg) { - fPreview.setFormat(format.getChecked()); - fPreview.update(); - } + format.addObserver((o, arg) -> { + fPreview.setFormat(format.getChecked()); + fPreview.update(); }); } @@ -97,12 +92,9 @@ public final class CodeFormatingTabPage extends AbstractCleanUpTabPage { final CheckboxPreference correctIndentation= createCheckboxPref(group, numColumns, CleanUpMessages.CodeFormatingTabPage_correctIndentation_checkbox_text, CleanUpConstants.FORMAT_CORRECT_INDENTATION, CleanUpModifyDialog.FALSE_TRUE); registerPreference(correctIndentation); - correctIndentation.addObserver(new Observer() { - @Override - public void update(Observable o, Object arg) { - fPreview.setCorrectIndentation(correctIndentation.getChecked()); - fPreview.update(); - } + correctIndentation.addObserver((o, arg) -> { + fPreview.setCorrectIndentation(correctIndentation.getChecked()); + fPreview.update(); }); if (!isSaveAction()) { @@ -134,23 +126,17 @@ public final class CodeFormatingTabPage extends AbstractCleanUpTabPage { final Label warningLabel= createLabel(numColumns - 2, sortMembersGroup, CleanUpMessages.CodeFormatingTabPage_SortMembersSemanticChange_warning); registerSlavePreference(sortMembersPref, new RadioPreference[] {sortAllPref}); - sortMembersPref.addObserver(new Observer() { - @Override - public void update(Observable o, Object arg) { - nullRadio.setEnabled(sortMembersPref.getChecked()); - - boolean warningEnabled= sortMembersPref.getChecked() && sortAllPref.getChecked(); - warningImage.setEnabled(warningEnabled); - warningLabel.setEnabled(warningEnabled); - } + sortMembersPref.addObserver((o, arg) -> { + nullRadio.setEnabled(sortMembersPref.getChecked()); + + boolean warningEnabled= sortMembersPref.getChecked() && sortAllPref.getChecked(); + warningImage.setEnabled(warningEnabled); + warningLabel.setEnabled(warningEnabled); }); - sortAllPref.addObserver(new Observer() { - @Override - public void update(Observable o, Object arg) { - boolean warningEnabled= sortMembersPref.getChecked() && sortAllPref.getChecked(); - warningImage.setEnabled(warningEnabled); - warningLabel.setEnabled(warningEnabled); - } + sortAllPref.addObserver((o, arg) -> { + boolean warningEnabled= sortMembersPref.getChecked() && sortAllPref.getChecked(); + warningImage.setEnabled(warningEnabled); + warningLabel.setEnabled(warningEnabled); }); nullRadio.setEnabled(sortMembersPref.getChecked()); nullRadio.setSelection(CleanUpOptions.FALSE.equals(fValues.get(CleanUpConstants.SORT_MEMBERS_ALL))); diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/AbstractInformationControl.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/AbstractInformationControl.java index a1678f5a46..9a3285c180 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/AbstractInformationControl.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/AbstractInformationControl.java @@ -23,8 +23,6 @@ import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.events.FocusListener; import org.eclipse.swt.events.KeyEvent; import org.eclipse.swt.events.KeyListener; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.MouseAdapter; import org.eclipse.swt.events.MouseEvent; import org.eclipse.swt.events.MouseMoveListener; @@ -420,12 +418,9 @@ public abstract class AbstractInformationControl extends PopupDialog implements private void installFilter() { fFilterText.setText(""); //$NON-NLS-1$ - fFilterText.addModifyListener(new ModifyListener() { - @Override - public void modifyText(ModifyEvent e) { - String text= ((Text) e.widget).getText(); - setMatcherString(text, true); - } + fFilterText.addModifyListener(e -> { + String text= ((Text) e.widget).getText(); + setMatcherString(text, true); }); } diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/JavaChangeHover.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/JavaChangeHover.java index a3a4e094c8..a6a3cae1b2 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/JavaChangeHover.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/JavaChangeHover.java @@ -15,13 +15,11 @@ package org.eclipse.jdt.internal.ui.text; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Point; -import org.eclipse.swt.widgets.Shell; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.IInformationControl; import org.eclipse.jface.text.IInformationControlCreator; import org.eclipse.jface.text.ITypedRegion; import org.eclipse.jface.text.TextUtilities; @@ -79,13 +77,10 @@ public class JavaChangeHover extends LineChangeHover { */ @Override public IInformationControlCreator getHoverControlCreator() { - return new IInformationControlCreator() { - @Override - public IInformationControl createInformationControl(Shell parent) { - fInformationControl= new ChangeHoverInformationControl(parent, false, fOrientation, fPartition, EditorsUI.getTooltipAffordanceString()); - fInformationControl.setHorizontalScrollPixel(fLastScrollIndex); - return fInformationControl; - } + return parent -> { + fInformationControl= new ChangeHoverInformationControl(parent, false, fOrientation, fPartition, EditorsUI.getTooltipAffordanceString()); + fInformationControl.setHorizontalScrollPixel(fLastScrollIndex); + return fInformationControl; }; } @@ -95,13 +90,10 @@ public class JavaChangeHover extends LineChangeHover { */ @Override public IInformationControlCreator getInformationPresenterControlCreator() { - return new IInformationControlCreator() { - @Override - public IInformationControl createInformationControl(Shell parent) { - fInformationControl= new ChangeHoverInformationControl(parent, true, fOrientation, fPartition, null); - fInformationControl.setHorizontalScrollPixel(fLastScrollIndex); - return fInformationControl; - } + return parent -> { + fInformationControl= new ChangeHoverInformationControl(parent, true, fOrientation, fPartition, null); + fInformationControl.setHorizontalScrollPixel(fLastScrollIndex); + return fInformationControl; }; } diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/JavaColorManager.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/JavaColorManager.java index 2b141b93df..750e4b90c6 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/JavaColorManager.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/JavaColorManager.java @@ -89,12 +89,7 @@ public class JavaColorManager implements IColorManager, IColorManagerExtension { colorTable= new HashMap<>(10); fDisplayTable.put(display, colorTable); if (fAutoDisposeOnDisplayDispose) { - display.disposeExec(new Runnable() { - @Override - public void run() { - dispose(display); - } - }); + display.disposeExec(() -> dispose(display)); } } diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/JavaOutlineInformationControl.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/JavaOutlineInformationControl.java index 3c52ec0de4..5025d4c838 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/JavaOutlineInformationControl.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/JavaOutlineInformationControl.java @@ -494,12 +494,7 @@ public class JavaOutlineInformationControl extends AbstractInformationControl { private void valueChanged(final boolean on, boolean store) { setChecked(on); - BusyIndicator.showWhile(fOutlineViewer.getControl().getDisplay(), new Runnable() { - @Override - public void run() { - fOutlineViewer.refresh(false); - } - }); + BusyIndicator.showWhile(fOutlineViewer.getControl().getDisplay(), () -> fOutlineViewer.refresh(false)); if (store) getDialogSettings().put(STORE_LEXICAL_SORTING_CHECKED, on); @@ -539,20 +534,17 @@ public class JavaOutlineInformationControl extends AbstractInformationControl { */ @Override public void run() { - BusyIndicator.showWhile(fOutlineViewer.getControl().getDisplay(), new Runnable() { - @Override - public void run() { - fInnerLabelProvider.setShowDefiningType(isChecked()); - getDialogSettings().put(STORE_SORT_BY_DEFINING_TYPE_CHECKED, isChecked()); + BusyIndicator.showWhile(fOutlineViewer.getControl().getDisplay(), () -> { + fInnerLabelProvider.setShowDefiningType(isChecked()); + getDialogSettings().put(STORE_SORT_BY_DEFINING_TYPE_CHECKED, isChecked()); - setMatcherString(fPattern, false); - fOutlineViewer.refresh(true); + setMatcherString(fPattern, false); + fOutlineViewer.refresh(true); - // reveal selection - Object selectedElement= getSelectedElement(); - if (selectedElement != null) - fOutlineViewer.reveal(selectedElement); - } + // reveal selection + Object selectedElement= getSelectedElement(); + if (selectedElement != null) + fOutlineViewer.reveal(selectedElement); }); } } diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/JavaReconciler.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/JavaReconciler.java index fb84d6a1c1..da0dc0a6d3 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/JavaReconciler.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/JavaReconciler.java @@ -32,7 +32,6 @@ import org.eclipse.core.resources.IResourceDelta; import org.eclipse.core.resources.IWorkspace; import org.eclipse.jface.util.IPropertyChangeListener; -import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.ITextViewer; @@ -340,12 +339,9 @@ public class JavaReconciler extends MonoReconciler { IWorkspace workspace= JavaPlugin.getWorkspace(); workspace.addResourceChangeListener(fResourceChangeListener); - fPropertyChangeListener= new IPropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent event) { - if (SpellingService.PREFERENCE_SPELLING_ENABLED.equals(event.getProperty()) || SpellingService.PREFERENCE_SPELLING_ENGINE.equals(event.getProperty())) - forceReconciling(); - } + fPropertyChangeListener= event -> { + if (SpellingService.PREFERENCE_SPELLING_ENABLED.equals(event.getProperty()) || SpellingService.PREFERENCE_SPELLING_ENGINE.equals(event.getProperty())) + forceReconciling(); }; JavaPlugin.getDefault().getCombinedPreferenceStore().addPropertyChangeListener(fPropertyChangeListener); diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/PreferencesAdapter.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/PreferencesAdapter.java index bd111074b5..ad2136f395 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/PreferencesAdapter.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/PreferencesAdapter.java @@ -102,12 +102,7 @@ public class PreferencesAdapter implements IPreferenceStore { if (!fSilent) { final PropertyChangeEvent event= new PropertyChangeEvent(this, name, oldValue, newValue); for (final IPropertyChangeListener listener : fListeners) { - Runnable runnable= new Runnable() { - @Override - public void run() { - listener.propertyChange(event); - } - }; + Runnable runnable= () -> listener.propertyChange(event); if (Display.getCurrent() != null) runnable.run(); diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/AdvancedQuickAssistProcessor.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/AdvancedQuickAssistProcessor.java index fc07134958..612ed1b5d9 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/AdvancedQuickAssistProcessor.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/AdvancedQuickAssistProcessor.java @@ -2150,15 +2150,12 @@ public class AdvancedQuickAssistProcessor implements IQuickAssistProcessor { } } // prepare inverted expression - SimpleNameRenameProvider provider= new SimpleNameRenameProvider() { - @Override - public SimpleName getRenamed(SimpleName simpleName) { - if (simpleName.resolveBinding() == variableBinding) { - renamedNames.add(simpleName); - return ast.newSimpleName(newIdentifier); - } - return null; + SimpleNameRenameProvider provider= simpleName -> { + if (simpleName.resolveBinding() == variableBinding) { + renamedNames.add(simpleName); + return ast.newSimpleName(newIdentifier); } + return null; }; Expression inversedExpression= getInversedExpression(rewrite, expression, provider); // if any name was not renamed during expression inverting, we can not already rename it, so fail to create assist diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/ClasspathFixProcessorDescriptor.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/ClasspathFixProcessorDescriptor.java index dd837775fe..f9ea5bcd45 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/ClasspathFixProcessorDescriptor.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/ClasspathFixProcessorDescriptor.java @@ -17,7 +17,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import java.util.Comparator; import java.util.HashSet; import java.util.List; @@ -159,17 +158,14 @@ public final class ClasspathFixProcessorDescriptor { } } fgContributedClasspathFixProcessors= res.toArray(new ClasspathFixProcessorDescriptor[res.size()]); - Arrays.sort(fgContributedClasspathFixProcessors, new Comparator<ClasspathFixProcessorDescriptor>() { - @Override - public int compare(ClasspathFixProcessorDescriptor d1, ClasspathFixProcessorDescriptor d2) { - if (d1.getOverridenIds().contains(d2.getID())) { - return -1; - } - if (d2.getOverridenIds().contains(d1.getID())) { - return 1; - } - return 0; + Arrays.sort(fgContributedClasspathFixProcessors, (d1, d2) -> { + if (d1.getOverridenIds().contains(d2.getID())) { + return -1; + } + if (d2.getOverridenIds().contains(d1.getID())) { + return 1; } + return 0; }); } return fgContributedClasspathFixProcessors; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/GetterSetterCorrectionSubProcessor.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/GetterSetterCorrectionSubProcessor.java index 844a062809..df67048c4e 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/GetterSetterCorrectionSubProcessor.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/GetterSetterCorrectionSubProcessor.java @@ -174,14 +174,11 @@ public class GetterSetterCorrectionSubProcessor { JavaPlugin.log(e); } } else { - Display.getDefault().syncExec(new Runnable() { - @Override - public void run() { - try { - helper.perform(false, false); - } catch (InterruptedException | InvocationTargetException e) { - JavaPlugin.log(e); - } + Display.getDefault().syncExec(() -> { + try { + helper.perform(false, false); + } catch (InterruptedException | InvocationTargetException e) { + JavaPlugin.log(e); } }); } diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/JavaCorrectionAssistant.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/JavaCorrectionAssistant.java index 3d1e6aedfc..c1f4cfcd91 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/JavaCorrectionAssistant.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/JavaCorrectionAssistant.java @@ -18,14 +18,12 @@ import java.util.ArrayList; import java.util.Iterator; import org.eclipse.swt.graphics.Point; -import org.eclipse.swt.widgets.Shell; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.DefaultInformationControl; import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.IInformationControl; import org.eclipse.jface.text.IInformationControlCreator; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.ITextViewer; @@ -112,12 +110,7 @@ public class JavaCorrectionAssistant extends QuickAssistAssistant { private IInformationControlCreator getInformationControlCreator() { - return new IInformationControlCreator() { - @Override - public IInformationControl createInformationControl(Shell parent) { - return new DefaultInformationControl(parent, JavaPlugin.getAdditionalInfoAffordanceString()); - } - }; + return parent -> new DefaultInformationControl(parent, JavaPlugin.getAdditionalInfoAffordanceString()); } @Override diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/QuickAssistLightBulbUpdater.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/QuickAssistLightBulbUpdater.java index 26cb783d05..81bdf1cdc2 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/QuickAssistLightBulbUpdater.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/QuickAssistLightBulbUpdater.java @@ -24,11 +24,9 @@ import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Canvas; import org.eclipse.jface.util.IPropertyChangeListener; -import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.ITextSelection; import org.eclipse.jface.text.ITextViewer; import org.eclipse.jface.text.Position; import org.eclipse.jface.text.source.Annotation; @@ -37,8 +35,6 @@ import org.eclipse.jface.text.source.IAnnotationModel; import org.eclipse.jface.text.source.IAnnotationPresentation; import org.eclipse.jface.text.source.ImageUtilities; -import org.eclipse.ui.IEditorPart; - import org.eclipse.ui.texteditor.AnnotationPreference; import org.eclipse.ui.texteditor.ITextEditor; @@ -125,12 +121,7 @@ public class QuickAssistLightBulbUpdater { } private void installSelectionListener() { - fListener= new ISelectionListenerWithAST() { - @Override - public void selectionChanged(IEditorPart part, ITextSelection selection, CompilationUnit astRoot) { - doSelectionChanged(selection.getOffset(), selection.getLength(), astRoot); - } - }; + fListener= (part, selection, astRoot) -> doSelectionChanged(selection.getOffset(), selection.getLength(), astRoot); SelectionListenerWithASTManager.getDefault().addListener(fEditor, fListener); } @@ -150,12 +141,7 @@ public class QuickAssistLightBulbUpdater { installSelectionListener(); } if (fPropertyChangeListener == null) { - fPropertyChangeListener= new IPropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent event) { - doPropertyChanged(event.getProperty()); - } - }; + fPropertyChangeListener= event -> doPropertyChanged(event.getProperty()); PreferenceConstants.getPreferenceStore().addPropertyChangeListener(fPropertyChangeListener); } } diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/QuickTemplateProcessor.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/QuickTemplateProcessor.java index eb15a50b6c..d2a4f6dc66 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/QuickTemplateProcessor.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/QuickTemplateProcessor.java @@ -16,7 +16,6 @@ package org.eclipse.jdt.internal.ui.text.correction; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.Comparator; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -163,12 +162,7 @@ public class QuickTemplateProcessor implements IQuickAssistProcessor { } private void sort(ArrayList<IJavaCompletionProposal> proposals) { - Collections.sort(proposals, new Comparator<IJavaCompletionProposal>() { - @Override - public int compare(IJavaCompletionProposal p1, IJavaCompletionProposal p2) { - return Collator.getInstance().compare(p1.getDisplayString(), p2.getDisplayString()); - } - }); + Collections.sort(proposals, (p1, p2) -> Collator.getInstance().compare(p1.getDisplayString(), p2.getDisplayString())); } private IDocument getDocument(ICompilationUnit cu) throws JavaModelException { diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/SerialVersionHashOperationDisplay.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/SerialVersionHashOperationDisplay.java index baf9ecfe61..45b72048b3 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/SerialVersionHashOperationDisplay.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/SerialVersionHashOperationDisplay.java @@ -35,15 +35,11 @@ public class SerialVersionHashOperationDisplay extends SerialVersionHashOperatio public void displayErrorMessage(final String message) { final Display display= PlatformUI.getWorkbench().getDisplay(); if (display != null && !display.isDisposed()) { - display.asyncExec(new Runnable() { - - @Override - public final void run() { - if (!display.isDisposed()) { - final Shell shell= display.getActiveShell(); - if (shell != null && !shell.isDisposed()) - MessageDialog.openError(shell, CorrectionMessages.SerialVersionHashOperation_dialog_error_caption, Messages.format(CorrectionMessages.SerialVersionHashOperation_dialog_error_message, message)); - } + display.asyncExec(() -> { + if (!display.isDisposed()) { + final Shell shell= display.getActiveShell(); + if (shell != null && !shell.isDisposed()) + MessageDialog.openError(shell, CorrectionMessages.SerialVersionHashOperation_dialog_error_caption, Messages.format(CorrectionMessages.SerialVersionHashOperation_dialog_error_message, message)); } }); } @@ -63,15 +59,11 @@ public class SerialVersionHashOperationDisplay extends SerialVersionHashOperatio final boolean[] result= { true}; final Display display= PlatformUI.getWorkbench().getDisplay(); if (display != null && !display.isDisposed()) { - display.syncExec(new Runnable() { - - @Override - public final void run() { - if (!display.isDisposed()) { - final Shell shell= display.getActiveShell(); - if (shell != null && !shell.isDisposed()) - result[0]= MessageDialog.openQuestion(shell, title, message); - } + display.syncExec(() -> { + if (!display.isDisposed()) { + final Shell shell= display.getActiveShell(); + if (shell != null && !shell.isDisposed()) + result[0]= MessageDialog.openQuestion(shell, title, message); } }); } diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/proposals/FixCorrectionProposal.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/proposals/FixCorrectionProposal.java index 83034bf457..2a8957b6dc 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/proposals/FixCorrectionProposal.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/proposals/FixCorrectionProposal.java @@ -27,7 +27,6 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Status; import org.eclipse.jface.operation.IRunnableContext; -import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.text.DocumentEvent; @@ -204,12 +203,7 @@ public class FixCorrectionProposal extends LinkedCorrectionProposal implements I refactoring.addCleanUp(fCleanUp); - IRunnableContext context= new IRunnableContext() { - @Override - public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException { - runnable.run(monitor == null ? new NullProgressMonitor() : monitor); - } - }; + IRunnableContext context= (fork, cancelable, runnable) -> runnable.run(monitor == null ? new NullProgressMonitor() : monitor); Shell shell= PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); RefactoringExecutionHelper helper= new RefactoringExecutionHelper(refactoring, IStatus.INFO, RefactoringSaveHelper.SAVE_REFACTORING, shell, context); diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/proposals/NewVariableCorrectionProposal.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/proposals/NewVariableCorrectionProposal.java index b6263fe98b..927a11e508 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/proposals/NewVariableCorrectionProposal.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/proposals/NewVariableCorrectionProposal.java @@ -15,7 +15,6 @@ package org.eclipse.jdt.internal.ui.text.correction.proposals; import java.util.Arrays; -import java.util.Comparator; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -382,12 +381,7 @@ public class NewVariableCorrectionProposal extends LinkedCorrectionProposal { return new SimpleName[] { fOriginalNode }; } if (names.length > 1) { - Arrays.sort(names, new Comparator<SimpleName>() { - @Override - public int compare(SimpleName s1, SimpleName s2) { - return s1.getStartPosition() - s2.getStartPosition(); - } - }); + Arrays.sort(names, (s1, s2) -> s1.getStartPosition() - s2.getStartPosition()); } return names; } diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/AbstractJavaCompletionProposal.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/AbstractJavaCompletionProposal.java index 047d25ec67..91e580e571 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/AbstractJavaCompletionProposal.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/AbstractJavaCompletionProposal.java @@ -67,7 +67,6 @@ import org.eclipse.jface.text.ITextViewerExtension4; import org.eclipse.jface.text.ITextViewerExtension5; import org.eclipse.jface.text.Position; import org.eclipse.jface.text.Region; -import org.eclipse.jface.text.TextPresentation; import org.eclipse.jface.text.contentassist.BoldStylerProvider; import org.eclipse.jface.text.contentassist.ICompletionProposalExtension; import org.eclipse.jface.text.contentassist.ICompletionProposalExtension2; @@ -1137,13 +1136,10 @@ public abstract class AbstractJavaCompletionProposal implements IJavaCompletionP if (viewer instanceof ITextViewerExtension4) { if (fTextPresentationListener == null) { - fTextPresentationListener= new ITextPresentationListener() { - @Override - public void applyTextPresentation(TextPresentation textPresentation) { - fRememberedStyleRange= createStyleRange(viewer); - if (fRememberedStyleRange != null) - textPresentation.mergeStyleRange(fRememberedStyleRange); - } + fTextPresentationListener= textPresentation -> { + fRememberedStyleRange= createStyleRange(viewer); + if (fRememberedStyleRange != null) + textPresentation.mergeStyleRange(fRememberedStyleRange); }; ((ITextViewerExtension4)viewer).addTextPresentationListener(fTextPresentationListener); } diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/LazyGenericTypeProposal.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/LazyGenericTypeProposal.java index 23d9088944..df41a13f6a 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/LazyGenericTypeProposal.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/LazyGenericTypeProposal.java @@ -32,7 +32,6 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IDocumentExtension; -import org.eclipse.jface.text.IDocumentListener; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.Position; import org.eclipse.jface.text.Region; @@ -784,16 +783,13 @@ public class LazyGenericTypeProposal extends LazyJavaTypeCompletionProposal { try { if (getTextViewer().getSelectedRange().y > 1 || flags != ILinkedModeListener.EXTERNAL_MODIFICATION) return; - ((IDocumentExtension) document).registerPostNotificationReplace(null, new IDocumentExtension.IReplace() { - @Override - public void perform(IDocument d, IDocumentListener owner) { - try { - if ((firstBracketPosition.length == 0 || firstBracketPosition.isDeleted) && !secondBracketPosition.isDeleted) { - d.replace(firstBracketPosition.offset, secondBracketPosition.offset - firstBracketPosition.offset, ""); //$NON-NLS-1$ - } - } catch (BadLocationException e) { - JavaPlugin.log(e); + ((IDocumentExtension) document).registerPostNotificationReplace(null, (d, owner) -> { + try { + if ((firstBracketPosition.length == 0 || firstBracketPosition.isDeleted) && !secondBracketPosition.isDeleted) { + d.replace(firstBracketPosition.offset, secondBracketPosition.offset - firstBracketPosition.offset, ""); //$NON-NLS-1$ } + } catch (BadLocationException e) { + JavaPlugin.log(e); } }); } finally { diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/AbstractAnnotationHover.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/AbstractAnnotationHover.java index 32cda3ffc8..015f11bd77 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/AbstractAnnotationHover.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/AbstractAnnotationHover.java @@ -26,8 +26,6 @@ import org.eclipse.swt.events.KeyEvent; import org.eclipse.swt.events.KeyListener; import org.eclipse.swt.events.MouseEvent; import org.eclipse.swt.events.MouseListener; -import org.eclipse.swt.events.PaintEvent; -import org.eclipse.swt.events.PaintListener; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.graphics.Color; @@ -336,12 +334,9 @@ public abstract class AbstractAnnotationHover extends AbstractJavaEditorTextHove gridData.widthHint= 17; gridData.heightHint= 16; canvas.setLayoutData(gridData); - canvas.addPaintListener(new PaintListener() { - @Override - public void paintControl(PaintEvent e) { - e.gc.setFont(null); - fMarkerAnnotationAccess.paint(annotation, e.gc, canvas, new Rectangle(0, 0, 16, 16)); - } + canvas.addPaintListener(e -> { + e.gc.setFont(null); + fMarkerAnnotationAccess.paint(annotation, e.gc, canvas, new Rectangle(0, 0, 16, 16)); }); StyledText text= new StyledText(composite, SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI | SWT.WRAP | SWT.READ_ONLY); diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/AbstractJavaEditorTextHover.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/AbstractJavaEditorTextHover.java index 518c19fc15..b259b229dd 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/AbstractJavaEditorTextHover.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/AbstractJavaEditorTextHover.java @@ -14,12 +14,9 @@ *******************************************************************************/ package org.eclipse.jdt.internal.ui.text.java.hover; -import org.eclipse.swt.widgets.Shell; - import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.DefaultInformationControl; import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.IInformationControl; import org.eclipse.jface.text.IInformationControlCreator; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.ITextHoverExtension; @@ -152,12 +149,7 @@ public abstract class AbstractJavaEditorTextHover implements IJavaEditorTextHove */ @Override public IInformationControlCreator getHoverControlCreator() { - return new IInformationControlCreator() { - @Override - public IInformationControl createInformationControl(Shell parent) { - return new DefaultInformationControl(parent, EditorsUI.getTooltipAffordanceString()); - } - }; + return parent -> new DefaultInformationControl(parent, EditorsUI.getTooltipAffordanceString()); } /** @@ -167,12 +159,7 @@ public abstract class AbstractJavaEditorTextHover implements IJavaEditorTextHove * @since 3.4 */ public IInformationControlCreator getInformationPresenterControlCreator() { - return new IInformationControlCreator() { - @Override - public IInformationControl createInformationControl(Shell shell) { - return new DefaultInformationControl(shell, true); - } - }; + return shell -> new DefaultInformationControl(shell, true); } protected ITypeRoot getEditorInputJavaElement() { diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/AnnotationExpansionControl.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/AnnotationExpansionControl.java index 52660cb416..c4027ac01e 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/AnnotationExpansionControl.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/AnnotationExpansionControl.java @@ -406,12 +406,7 @@ public class AnnotationExpansionControl implements IInformationControl, IInforma * */ public HoverManager() { - super(new IInformationControlCreator() { - @Override - public IInformationControl createInformationControl(Shell parent) { - return new DefaultInformationControl(parent); - } - }); + super(DefaultInformationControl::new); setMargins(5, 10); setAnchor(ANCHOR_BOTTOM); @@ -476,14 +471,7 @@ public class AnnotationExpansionControl implements IInformationControl, IInforma fMouseListener= new MyMouseListener(); fMenuDetectListener= new MyMenuDetectListener(); fDisposeListener= new MyDisposeListener(); - fViewportListener= new IViewportListener() { - - @Override - public void viewportChanged(int verticalOffset) { - dispose(); - } - - }; + fViewportListener= verticalOffset -> dispose(); fLayouter= new LinearLayouter(); if (access instanceof IAnnotationAccessExtension) diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/JavaExpandHover.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/JavaExpandHover.java index 13d18f00e0..fa3281fac3 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/JavaExpandHover.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/JavaExpandHover.java @@ -28,7 +28,6 @@ import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.IInformationControlExtension2; import org.eclipse.jface.text.Position; import org.eclipse.jface.text.source.Annotation; import org.eclipse.jface.text.source.CompositeRuler; @@ -159,14 +158,7 @@ public class JavaExpandHover extends AnnotationExpandHover { input.fRulerInfo= fCompositeRuler; input.fAnnotationListener= fgListener; input.fDoubleClickListener= fDblClickListener; - input.redoAction= new AnnotationExpansionControl.ICallback() { - - @Override - public void run(IInformationControlExtension2 control) { - control.setInput(getHoverInfoForLine(viewer, line)); - } - - }; + input.redoAction= control -> control.setInput(getHoverInfoForLine(viewer, line)); input.model= model; return input; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/JavaSourceHover.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/JavaSourceHover.java index bbedbb6148..b4452c0e90 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/JavaSourceHover.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/JavaSourceHover.java @@ -21,14 +21,12 @@ import org.eclipse.swt.custom.StyledText; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.Document; import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.IInformationControl; import org.eclipse.jface.text.IInformationControlCreator; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.ITextViewer; @@ -249,12 +247,7 @@ public class JavaSourceHover extends AbstractJavaEditorTextHover { throw ex; } - display.syncExec(new Runnable() { - @Override - public void run() { - topIndex[0]= textViewer.getTopIndex(); - } - }); + display.syncExec(() -> topIndex[0]= textViewer.getTopIndex()); int topLine= topIndex[0]; if (topLine == -1) @@ -497,68 +490,65 @@ public class JavaSourceHover extends AbstractJavaEditorTextHover { * @since 3.8 */ private IInformationControlCreator createInformationControlCreator(final boolean isResizable, final String statusFieldText, final boolean doShiftUp) { - return new IInformationControlCreator() { - @Override - public IInformationControl createInformationControl(final Shell parent) { - final IEditorPart editor= getEditor(); - int orientation= SWT.NONE; - if (editor instanceof IWorkbenchPartOrientation) - orientation= ((IWorkbenchPartOrientation) editor).getOrientation(); - - return new SourceViewerInformationControl(parent, isResizable, orientation, statusFieldText) { - @Override - public void setLocation(Point location) { - Point loc= location; - if (doShiftUp && fUpwardShiftInLines > 0) { - Point size= super.computeSizeConstraints(0, fUpwardShiftInLines + 1); - //bracket hover is rendered above '}' - int y= location.y - size.y - 5; //AbstractInformationControlManager.fMarginY = 5 - Rectangle trim= computeTrim(); - loc= new Point(location.x + trim.x - getViewer().getTextWidget().getLeftMargin(), y - trim.height - trim.y); - } - super.setLocation(loc); + return parent -> { + final IEditorPart editor= getEditor(); + int orientation= SWT.NONE; + if (editor instanceof IWorkbenchPartOrientation) + orientation= ((IWorkbenchPartOrientation) editor).getOrientation(); + + return new SourceViewerInformationControl(parent, isResizable, orientation, statusFieldText) { + @Override + public void setLocation(Point location) { + Point loc= location; + if (doShiftUp && fUpwardShiftInLines > 0) { + Point size= super.computeSizeConstraints(0, fUpwardShiftInLines + 1); + //bracket hover is rendered above '}' + int y= location.y - size.y - 5; //AbstractInformationControlManager.fMarginY = 5 + Rectangle trim= computeTrim(); + loc= new Point(location.x + trim.x - getViewer().getTextWidget().getLeftMargin(), y - trim.height - trim.y); } + super.setLocation(loc); + } - @Override - public Point computeSizeConstraints(int widthInChars, int heightInChars) { - if (doShiftUp && fUpwardShiftInLines > 0) { - Point sizeConstraints= super.computeSizeConstraints(widthInChars, heightInChars); - return new Point(sizeConstraints.x, 0); //set height as 0 to ensure selection of bottom anchor in AbstractInformationControlManager.computeInformationControlLocation(...) - } else { - return super.computeSizeConstraints(widthInChars, heightInChars); - } + @Override + public Point computeSizeConstraints(int widthInChars, int heightInChars) { + if (doShiftUp && fUpwardShiftInLines > 0) { + Point sizeConstraints= super.computeSizeConstraints(widthInChars, heightInChars); + return new Point(sizeConstraints.x, 0); //set height as 0 to ensure selection of bottom anchor in AbstractInformationControlManager.computeInformationControlLocation(...) + } else { + return super.computeSizeConstraints(widthInChars, heightInChars); } + } - @Override - public void setSize(int width, int height) { - if (doShiftUp && fUpwardShiftInLines != 0) { - //compute the correct height of hover, this was set to 0 in computeSizeConstraints(..) - Point size= super.computeSizeConstraints(0, fUpwardShiftInLines); - Rectangle trim= computeTrim(); - super.setSize(width, size.y + trim.height - trim.y); - } else { - super.setSize(width, height); - } + @Override + public void setSize(int width, int height) { + if (doShiftUp && fUpwardShiftInLines != 0) { + //compute the correct height of hover, this was set to 0 in computeSizeConstraints(..) + Point size= super.computeSizeConstraints(0, fUpwardShiftInLines); + Rectangle trim= computeTrim(); + super.setSize(width, size.y + trim.height - trim.y); + } else { + super.setSize(width, height); } + } - @Override - public IInformationControlCreator getInformationPresenterControlCreator() { - if (doShiftUp && fUpwardShiftInLines > 0) { - // Hack: We don't wan't to have auto-enrichment when the mouse moves into the hover, - // but we do want F2 to persist the hover. The framework has no way to distinguish the - // two requests, so we have to implement this aspect. - for (StackTraceElement element : Thread.currentThread().getStackTrace()) { - if ("canMoveIntoInformationControl".equals(element.getMethodName()) //$NON-NLS-1$ - && "org.eclipse.jface.text.AbstractHoverInformationControlManager".equals(element.getClassName())) //$NON-NLS-1$ - return null; //do not enrich bracket hover - } - return JavaSourceHover.this.createInformationControlCreator(isResizable && !isResizable, statusFieldText, false); - } else { - return super.getInformationPresenterControlCreator(); + @Override + public IInformationControlCreator getInformationPresenterControlCreator() { + if (doShiftUp && fUpwardShiftInLines > 0) { + // Hack: We don't wan't to have auto-enrichment when the mouse moves into the hover, + // but we do want F2 to persist the hover. The framework has no way to distinguish the + // two requests, so we have to implement this aspect. + for (StackTraceElement element : Thread.currentThread().getStackTrace()) { + if ("canMoveIntoInformationControl".equals(element.getMethodName()) //$NON-NLS-1$ + && "org.eclipse.jface.text.AbstractHoverInformationControlManager".equals(element.getClassName())) //$NON-NLS-1$ + return null; //do not enrich bracket hover } + return JavaSourceHover.this.createInformationControlCreator(isResizable && !isResizable, statusFieldText, false); + } else { + return super.getInformationPresenterControlCreator(); } - }; - } + } + }; }; } } diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/JavadocHover.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/JavadocHover.java index ba19c6e1e4..ceab1e40d0 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/JavadocHover.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/JavadocHover.java @@ -353,21 +353,18 @@ public class JavadocHover extends AbstractJavaEditorTextHover { tbm.add(openAttachedJavadocAction); } - IInputChangedListener inputChangeListener= new IInputChangedListener() { - @Override - public void inputChanged(Object newInput) { - backAction.update(); - forwardAction.update(); - if (newInput == null) { - selectionProvider.setSelection(new StructuredSelection()); - } else if (newInput instanceof BrowserInformationControlInput) { - BrowserInformationControlInput input= (BrowserInformationControlInput) newInput; - Object inputElement= input.getInputElement(); - selectionProvider.setSelection(new StructuredSelection(inputElement)); - boolean isJavaElementInput= inputElement instanceof IJavaElement; - showInJavadocViewAction.setEnabled(isJavaElementInput); - openDeclarationAction.setEnabled(isJavaElementInput); - } + IInputChangedListener inputChangeListener= newInput -> { + backAction.update(); + forwardAction.update(); + if (newInput == null) { + selectionProvider.setSelection(new StructuredSelection()); + } else if (newInput instanceof BrowserInformationControlInput) { + BrowserInformationControlInput input= (BrowserInformationControlInput) newInput; + Object inputElement= input.getInputElement(); + selectionProvider.setSelection(new StructuredSelection(inputElement)); + boolean isJavaElementInput= inputElement instanceof IJavaElement; + showInJavadocViewAction.setEnabled(isJavaElementInput); + openDeclarationAction.setEnabled(isJavaElementInput); } }; iControl.addInputChangeListener(inputChangeListener); @@ -446,12 +443,7 @@ public class JavadocHover extends AbstractJavaEditorTextHover { return new DefaultInformationControl(parent, tooltipAffordanceString) { @Override public IInformationControlCreator getInformationPresenterControlCreator() { - return new IInformationControlCreator() { - @Override - public IInformationControl createInformationControl(Shell parentShell) { - return new DefaultInformationControl(parentShell, (ToolBarManager) null, new FallbackInformationPresenter()); - } - }; + return parentShell -> new DefaultInformationControl(parentShell, (ToolBarManager) null, new FallbackInformationPresenter()); } }; } diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/SourceViewerInformationControl.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/SourceViewerInformationControl.java index 5209629815..13b392986c 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/SourceViewerInformationControl.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/SourceViewerInformationControl.java @@ -333,15 +333,12 @@ public class SourceViewerInformationControl if (fShell != null && !fShell.isDisposed()) { Display display= fShell.getDisplay(); if (!display.isDisposed()) { - display.asyncExec(new Runnable() { - @Override - public void run() { - IJavaElement javaElement= null; - if (input instanceof JavaSourceInformationInput) { - javaElement= ((JavaSourceInformationInput) input).getJavaElement(); - } - updateViewerConfiguration(javaElement); + display.asyncExec(() -> { + IJavaElement javaElement= null; + if (input instanceof JavaSourceInformationInput) { + javaElement= ((JavaSourceInformationInput) input).getJavaElement(); } + updateViewerConfiguration(javaElement); }); } } @@ -604,12 +601,7 @@ public class SourceViewerInformationControl */ @Override public IInformationControlCreator getInformationPresenterControlCreator() { - return new IInformationControlCreator() { - @Override - public IInformationControl createInformationControl(Shell parent) { - return new SourceViewerInformationControl(parent, true, fOrientation, null); - } - }; + return parent -> new SourceViewerInformationControl(parent, true, fOrientation, null); } /* diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/javadoc/JavadocContentAccess2.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/javadoc/JavadocContentAccess2.java index 6144447131..babe69dbfa 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/javadoc/JavadocContentAccess2.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/javadoc/JavadocContentAccess2.java @@ -322,12 +322,7 @@ public class JavadocContentAccess2 { * <code>null</code> if none could be found */ public CharSequence getInheritedTypeParamDescription(IMethod method, final int typeParamIndex) { - return getInheritedDescription(method, new DescriptionGetter() { - @Override - public CharSequence getDescription(JavadocContentAccess2 contentAccess) throws JavaModelException { - return contentAccess.getInheritedTypeParamDescription(typeParamIndex); - } - }); + return getInheritedDescription(method, contentAccess -> contentAccess.getInheritedTypeParamDescription(typeParamIndex)); } /** @@ -340,12 +335,7 @@ public class JavadocContentAccess2 { * or <code>null</code> if none could be found */ public CharSequence getInheritedParamDescription(IMethod method, final int paramIndex) { - return getInheritedDescription(method, new DescriptionGetter() { - @Override - public CharSequence getDescription(JavadocContentAccess2 contentAccess) throws JavaModelException { - return contentAccess.getInheritedParamDescription(paramIndex); - } - }); + return getInheritedDescription(method, contentAccess -> contentAccess.getInheritedParamDescription(paramIndex)); } /** @@ -369,12 +359,7 @@ public class JavadocContentAccess2 { * or <code>null</code> if none could be found */ public CharSequence getInheritedExceptionDescription(IMethod method, final String simpleName) { - return getInheritedDescription(method, new DescriptionGetter() { - @Override - public CharSequence getDescription(JavadocContentAccess2 contentAccess) { - return contentAccess.getExceptionDescription(simpleName); - } - }); + return getInheritedDescription(method, contentAccess -> contentAccess.getExceptionDescription(simpleName)); } private CharSequence getInheritedDescription(final IMethod method, final DescriptionGetter descriptionGetter) { diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/template/contentassist/TemplateInformationControlCreator.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/template/contentassist/TemplateInformationControlCreator.java index 8f548ecac7..f45853edb1 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/template/contentassist/TemplateInformationControlCreator.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/template/contentassist/TemplateInformationControlCreator.java @@ -14,8 +14,6 @@ package org.eclipse.jdt.internal.ui.text.template.contentassist; import org.eclipse.swt.SWT; -import org.eclipse.swt.events.DisposeEvent; -import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.widgets.Shell; import org.eclipse.core.runtime.Assert; @@ -53,12 +51,7 @@ public final class TemplateInformationControlCreator implements IInformationCont @Override public IInformationControl createInformationControl(Shell parent) { fControl= new SourceViewerInformationControl(parent, false, fOrientation, JavaPlugin.getAdditionalInfoAffordanceString()); - fControl.addDisposeListener(new DisposeListener() { - @Override - public void widgetDisposed(DisposeEvent e) { - fControl= null; - } - }); + fControl.addDisposeListener(e -> fControl= null); return fControl; } diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/EnableMemberFilterAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/EnableMemberFilterAction.java index 82fb4f44a5..c83930fb83 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/EnableMemberFilterAction.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/EnableMemberFilterAction.java @@ -50,11 +50,6 @@ public class EnableMemberFilterAction extends Action { */ @Override public void run() { - BusyIndicator.showWhile(fView.getSite().getShell().getDisplay(), new Runnable() { - @Override - public void run() { - fView.showMembersInHierarchy(isChecked()); - } - }); + BusyIndicator.showWhile(fView.getSite().getShell().getDisplay(), () -> fView.showMembersInHierarchy(isChecked())); } } diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/MethodsLabelProvider.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/MethodsLabelProvider.java index 05b6b8ea4a..97ca0419ac 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/MethodsLabelProvider.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/MethodsLabelProvider.java @@ -17,7 +17,6 @@ import org.eclipse.swt.graphics.Color; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.util.IPropertyChangeListener; -import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.jface.viewers.LabelProviderChangedEvent; import org.eclipse.jface.viewers.StyledString; @@ -50,12 +49,9 @@ public class MethodsLabelProvider extends AppearanceAwareLabelProvider { fHierarchy= lifeCycle; fShowDefiningType= false; fMethodsViewer= methodsViewer; - fColorRegistryListener= new IPropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent event) { - if (event.getProperty().equals(ColoredViewersManager.INHERITED_COLOR_NAME)) { - fireLabelProviderChanged(new LabelProviderChangedEvent(MethodsLabelProvider.this, null)); - } + fColorRegistryListener= event -> { + if (event.getProperty().equals(ColoredViewersManager.INHERITED_COLOR_NAME)) { + fireLabelProviderChanged(new LabelProviderChangedEvent(MethodsLabelProvider.this, null)); } }; JFaceResources.getColorRegistry().addListener(fColorRegistryListener); diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/ShowInheritedMembersAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/ShowInheritedMembersAction.java index 39033b405a..f3754d80a6 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/ShowInheritedMembersAction.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/ShowInheritedMembersAction.java @@ -54,11 +54,6 @@ public class ShowInheritedMembersAction extends Action { */ @Override public void run() { - BusyIndicator.showWhile(fMethodsViewer.getControl().getDisplay(), new Runnable() { - @Override - public void run() { - fMethodsViewer.showInheritedMethods(isChecked()); - } - }); + BusyIndicator.showWhile(fMethodsViewer.getControl().getDisplay(), () -> fMethodsViewer.showInheritedMethods(isChecked())); } } diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/ShowQualifiedTypeNamesAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/ShowQualifiedTypeNamesAction.java index 7e9f87d0e4..f6df7c15a5 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/ShowQualifiedTypeNamesAction.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/ShowQualifiedTypeNamesAction.java @@ -49,11 +49,6 @@ public class ShowQualifiedTypeNamesAction extends Action { */ @Override public void run() { - BusyIndicator.showWhile(fView.getSite().getShell().getDisplay(), new Runnable() { - @Override - public void run() { - fView.showQualifiedTypeNames(isChecked()); - } - }); + BusyIndicator.showWhile(fView.getSite().getShell().getDisplay(), () -> fView.showQualifiedTypeNames(isChecked())); } } diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/SortByDefiningTypeAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/SortByDefiningTypeAction.java index 600b31e68f..cd52e6886f 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/SortByDefiningTypeAction.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/SortByDefiningTypeAction.java @@ -53,11 +53,6 @@ public class SortByDefiningTypeAction extends Action { */ @Override public void run() { - BusyIndicator.showWhile(fMethodsViewer.getControl().getDisplay(), new Runnable() { - @Override - public void run() { - fMethodsViewer.sortByDefiningType(isChecked()); - } - }); + BusyIndicator.showWhile(fMethodsViewer.getControl().getDisplay(), () -> fMethodsViewer.sortByDefiningType(isChecked())); } } diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyLifeCycle.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyLifeCycle.java index 7d25b4d804..fa9244a58d 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyLifeCycle.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyLifeCycle.java @@ -199,16 +199,13 @@ public class TypeHierarchyLifeCycle implements ITypeHierarchyChangedListener, IE if (hierachyCreationNeeded || fHierarchyRefreshNeeded) { if (fTypeHierarchyViewPart == null) { - IRunnableWithProgress op= new IRunnableWithProgress() { - @Override - public void run(IProgressMonitor pm) throws InvocationTargetException, InterruptedException { - try { - doHierarchyRefresh(elements, pm); - } catch (JavaModelException e) { - throw new InvocationTargetException(e); - } catch (OperationCanceledException e) { - throw new InterruptedException(); - } + IRunnableWithProgress op= pm -> { + try { + doHierarchyRefresh(elements, pm); + } catch (JavaModelException e1) { + throw new InvocationTargetException(e1); + } catch (OperationCanceledException e2) { + throw new InterruptedException(); } }; fHierarchyRefreshNeeded= true; @@ -274,23 +271,17 @@ public class TypeHierarchyLifeCycle implements ITypeHierarchyChangedListener, IE protected void doHierarchyRefreshBackground(final IJavaElement[] elements, final IProgressMonitor pm) throws JavaModelException { doHierarchyRefresh(elements, pm); if (!pm.isCanceled()) { - Display.getDefault().asyncExec(new Runnable() { - /* - * @see java.lang.Runnable#run() - */ - @Override - public void run() { - synchronized (TypeHierarchyLifeCycle.this) { - if (fRefreshHierarchyJob == null) { - return; - } - fRefreshHierarchyJob= null; - } - if (pm.isCanceled()) + Display.getDefault().asyncExec(() -> { + synchronized (TypeHierarchyLifeCycle.this) { + if (fRefreshHierarchyJob == null) { return; - fTypeHierarchyViewPart.setViewersInput(); - fTypeHierarchyViewPart.updateViewers(); + } + fRefreshHierarchyJob= null; } + if (pm.isCanceled()) + return; + fTypeHierarchyViewPart.setViewersInput(); + fTypeHierarchyViewPart.updateViewers(); }); } } diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyViewPart.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyViewPart.java index eb5022a590..c3d2fbd876 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyViewPart.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyViewPart.java @@ -52,7 +52,6 @@ import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.IStatusLineManager; import org.eclipse.jface.action.IToolBarManager; @@ -272,12 +271,7 @@ public class TypeHierarchyViewPart extends ViewPart implements ITypeHierarchyVie fTypeHierarchyLifeCycleListener= this::doTypeHierarchyChanged; fHierarchyLifeCycle.addChangedListener(fTypeHierarchyLifeCycleListener); - fPropertyChangeListener= new IPropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent event) { - doPropertyChange(event); - } - }; + fPropertyChangeListener= this::doPropertyChange; PreferenceConstants.getPreferenceStore().addPropertyChangeListener(fPropertyChangeListener); fIsEnableMemberFilter= false; @@ -356,12 +350,7 @@ public class TypeHierarchyViewPart extends ViewPart implements ITypeHierarchyVie public void partOpened(IWorkbenchPartReference ref) {} }; - fSelectionChangedListener= new ISelectionChangedListener() { - @Override - public void selectionChanged(SelectionChangedEvent event) { - doSelectionChanged(event); - } - }; + fSelectionChangedListener= this::doSelectionChanged; } protected void doPropertyChange(PropertyChangeEvent event) { @@ -726,13 +715,7 @@ public class TypeHierarchyViewPart extends ViewPart implements ITypeHierarchyVie return (T) getShowInSource(); } if (key == IShowInTargetList.class) { - return (T) new IShowInTargetList() { - @Override - public String[] getShowInTargetIds() { - return new String[] { JavaUI.ID_PACKAGES}; - } - - }; + return (T) (IShowInTargetList) () -> new String[] { JavaUI.ID_PACKAGES}; } if (key == IContextProvider.class) { return (T) JavaUIHelp.getHelpContextProvider(this, IJavaHelpContextIds.TYPE_HIERARCHY_VIEW); @@ -806,12 +789,7 @@ public class TypeHierarchyViewPart extends ViewPart implements ITypeHierarchyVie private void initializeTypesViewer(final TypeHierarchyViewer typesViewer, KeyListener keyListener, String cotextHelpId) { typesViewer.getControl().setVisible(false); typesViewer.getControl().addKeyListener(keyListener); - typesViewer.initContextMenu(new IMenuListener() { - @Override - public void menuAboutToShow(IMenuManager menu) { - fillTypesViewerContextMenu(typesViewer, menu); - } - }, cotextHelpId, getSite()); + typesViewer.initContextMenu(menu -> fillTypesViewerContextMenu(typesViewer, menu), cotextHelpId, getSite()); typesViewer.addPostSelectionChangedListener(fSelectionChangedListener); typesViewer.setQualifiedTypeName(isQualifiedTypeNamesEnabled()); typesViewer.setWorkingSetFilter(fWorkingSetActionGroup.getWorkingSetFilter()); @@ -819,12 +797,7 @@ public class TypeHierarchyViewPart extends ViewPart implements ITypeHierarchyVie private Control createMethodViewerControl(Composite parent) { fMethodsViewer= new MethodsViewer(parent, fHierarchyLifeCycle); - fMethodsViewer.initContextMenu(new IMenuListener() { - @Override - public void menuAboutToShow(IMenuManager menu) { - fillMethodsViewerContextMenu(menu); - } - }, IContextMenuConstants.TARGET_ID_MEMBERS_VIEW, getSite()); + fMethodsViewer.initContextMenu(this::fillMethodsViewerContextMenu, IContextMenuConstants.TARGET_ID_MEMBERS_VIEW, getSite()); fMethodsViewer.addPostSelectionChangedListener(fSelectionChangedListener); new OpenAndLinkWithEditorHelper(fMethodsViewer) { @@ -1236,12 +1209,7 @@ public class TypeHierarchyViewPart extends ViewPart implements ITypeHierarchyVie fPagebook.showPage(fNoHierarchyShownLabel); } else { if (getCurrentViewer().containsElements() != null) { - Runnable runnable= new Runnable() { - @Override - public void run() { - getCurrentViewer().updateContent(doExpand); // refresh - } - }; + Runnable runnable= () -> getCurrentViewer().updateContent(doExpand); BusyIndicator.showWhile(getDisplay(), runnable); if (!isChildVisible(fViewerbook, getCurrentViewer().getControl())) { setViewerVisibility(true); @@ -1257,12 +1225,7 @@ public class TypeHierarchyViewPart extends ViewPart implements ITypeHierarchyVie if (!fIsEnableMemberFilter && fCurrentLayout != VIEW_LAYOUT_SINGLE) { if (input == fMethodsViewer.getInput()) { if (input != null) { - Runnable runnable= new Runnable() { - @Override - public void run() { - fMethodsViewer.refresh(); // refresh - } - }; + Runnable runnable= () -> fMethodsViewer.refresh(); BusyIndicator.showWhile(getDisplay(), runnable); } } else { @@ -1273,12 +1236,7 @@ public class TypeHierarchyViewPart extends ViewPart implements ITypeHierarchyVie fMethodViewerPaneLabel.setText(""); //$NON-NLS-1$ fMethodViewerPaneLabel.setImage(null); } - Runnable runnable= new Runnable() { - @Override - public void run() { - fMethodsViewer.setInput(input); // refresh - } - }; + Runnable runnable= () -> fMethodsViewer.setInput(input); BusyIndicator.showWhile(getDisplay(), runnable); } } @@ -1573,16 +1531,13 @@ public class TypeHierarchyViewPart extends ViewPart implements ITypeHierarchyVie Display display= getDisplay(); if (display != null) { fIsRefreshRunnablePosted= true; - display.asyncExec(new Runnable() { - @Override - public void run() { - try { - if (fPagebook != null && !fPagebook.isDisposed()) { - doTypeHierarchyChangedOnViewers(changedTypes); - } - } finally { - fIsRefreshRunnablePosted= false; + display.asyncExec(() -> { + try { + if (fPagebook != null && !fPagebook.isDisposed()) { + doTypeHierarchyChangedOnViewers(changedTypes); } + } finally { + fIsRefreshRunnablePosted= false; } }); } @@ -1727,13 +1682,10 @@ public class TypeHierarchyViewPart extends ViewPart implements ITypeHierarchyVie fHierarchyLifeCycle.doHierarchyRefresh(hierarchyInput, monitor); final boolean doRestore= !monitor.isCanceled(); if (doRestore) { - Display.getDefault().asyncExec(new Runnable() { - @Override - public void run() { - // running async: check first if view still exists - if (fPagebook != null && !fPagebook.isDisposed()) { - doRestoreState(memento, hierarchyInput); - } + Display.getDefault().asyncExec(() -> { + // running async: check first if view still exists + if (fPagebook != null && !fPagebook.isDisposed()) { + doRestoreState(memento, hierarchyInput); } }); } @@ -1849,14 +1801,9 @@ public class TypeHierarchyViewPart extends ViewPart implements ITypeHierarchyVie * @return Returns the <code>IShowInSource</code> for this view. */ protected IShowInSource getShowInSource() { - return new IShowInSource() { - @Override - public ShowInContext getShowInContext() { - return new ShowInContext( - null, - getSite().getSelectionProvider().getSelection()); - } - }; + return () -> new ShowInContext( + null, + getSite().getSelectionProvider().getSelection()); } @Override @@ -1891,15 +1838,12 @@ public class TypeHierarchyViewPart extends ViewPart implements ITypeHierarchyVie * @since 3.6 */ public void showEmptyViewer() { - Display.getDefault().asyncExec(new Runnable() { - @Override - public void run() { - if (isDisposed()) - return; + Display.getDefault().asyncExec(() -> { + if (isDisposed()) + return; - clearInput(); - setKeepShowingEmptyViewers(true); - } + clearInput(); + setKeepShowingEmptyViewers(true); }); } diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ColoredViewersManager.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ColoredViewersManager.java index 107267313c..ae9a9427f7 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ColoredViewersManager.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ColoredViewersManager.java @@ -76,12 +76,7 @@ public class ColoredViewersManager implements IPropertyChangeListener { || property.equals(INHERITED_COLOR_NAME) || property.equals(IWorkbenchPreferenceConstants.USE_COLORED_LABELS) ) { - Display.getDefault().asyncExec(new Runnable() { - @Override - public void run() { - updateAllViewers(); - } - }); + Display.getDefault().asyncExec(this::updateAllViewers); } } diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/FilterUpdater.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/FilterUpdater.java index 7101779fe3..85bf50aae8 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/FilterUpdater.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/FilterUpdater.java @@ -50,12 +50,9 @@ public class FilterUpdater implements IResourceChangeListener { final Control ctrl= fViewer.getControl(); if (ctrl != null && !ctrl.isDisposed()) { // async is needed due to bug 33783 - ctrl.getDisplay().asyncExec(new Runnable() { - @Override - public void run() { - if (!ctrl.isDisposed()) - fViewer.refresh(false); - } + ctrl.getDisplay().asyncExec(() -> { + if (!ctrl.isDisposed()) + fViewer.refresh(false); }); } return; // one refresh is good enough diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/HistoryDropDownAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/HistoryDropDownAction.java index 55edf30266..28d6a752b7 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/HistoryDropDownAction.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/HistoryDropDownAction.java @@ -126,14 +126,11 @@ import org.eclipse.ui.IWorkbenchActionConstants; fMenu.addMenuListener(new MenuAdapter() { @Override public void menuHidden(final MenuEvent e) { - display.asyncExec(new Runnable() { - @Override - public void run() { - manager.removeAll(); - if (fMenu != null) { - fMenu.dispose(); - fMenu= null; - } + display.asyncExec(() -> { + manager.removeAll(); + if (fMenu != null) { + fMenu.dispose(); + fMenu= null; } }); } diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/HistoryListAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/HistoryListAction.java index d3a593158d..3f57fbf89f 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/HistoryListAction.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/HistoryListAction.java @@ -39,7 +39,6 @@ import org.eclipse.jdt.internal.corext.util.Messages; import org.eclipse.jdt.internal.ui.JavaUIMessages; import org.eclipse.jdt.internal.ui.dialogs.StatusInfo; import org.eclipse.jdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.jdt.internal.ui.wizards.dialogfields.IDialogFieldListener; import org.eclipse.jdt.internal.ui.wizards.dialogfields.IListAdapter; import org.eclipse.jdt.internal.ui.wizards.dialogfields.LayoutUtil; import org.eclipse.jdt.internal.ui.wizards.dialogfields.ListDialogField; @@ -111,22 +110,19 @@ import org.eclipse.jdt.internal.ui.wizards.dialogfields.StringDialogField; private void createMaxEntriesField() { fMaxEntriesField= new StringDialogField(); fMaxEntriesField.setLabelText(fHistory.getMaxEntriesMessage()); - fMaxEntriesField.setDialogFieldListener(new IDialogFieldListener() { - @Override - public void dialogFieldChanged(DialogField field) { - String maxString= fMaxEntriesField.getText(); - boolean valid; - try { - fMaxEntries= Integer.parseInt(maxString); - valid= fMaxEntries > 0 && fMaxEntries < MAX_MAX_ENTRIES; - } catch (NumberFormatException e) { - valid= false; - } - if (valid) - updateStatus(StatusInfo.OK_STATUS); - else - updateStatus(new StatusInfo(IStatus.ERROR, Messages.format(JavaUIMessages.HistoryListAction_max_entries_constraint, Integer.toString(MAX_MAX_ENTRIES)))); + fMaxEntriesField.setDialogFieldListener(field -> { + String maxString= fMaxEntriesField.getText(); + boolean valid; + try { + fMaxEntries= Integer.parseInt(maxString); + valid= fMaxEntries > 0 && fMaxEntries < MAX_MAX_ENTRIES; + } catch (NumberFormatException e) { + valid= false; } + if (valid) + updateStatus(StatusInfo.OK_STATUS); + else + updateStatus(new StatusInfo(IStatus.ERROR, Messages.format(JavaUIMessages.HistoryListAction_max_entries_constraint, Integer.toString(MAX_MAX_ENTRIES)))); }); fMaxEntriesField.setText(Integer.toString(fHistory.getMaxEntries())); } diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ImageDescriptorRegistry.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ImageDescriptorRegistry.java index 77df7b3113..f6ca447e0a 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ImageDescriptorRegistry.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ImageDescriptorRegistry.java @@ -77,16 +77,6 @@ public class ImageDescriptorRegistry { } private void hookDisplay() { - fDisplay.asyncExec(new Runnable() { - @Override - public void run() { - fDisplay.disposeExec(new Runnable() { - @Override - public void run() { - dispose(); - } - }); - } - }); + fDisplay.asyncExec(() -> fDisplay.disposeExec(this::dispose)); } } diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/JavaElementLabelComposer.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/JavaElementLabelComposer.java index 249a82da36..8504654ace 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/JavaElementLabelComposer.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/JavaElementLabelComposer.java @@ -17,7 +17,6 @@ package org.eclipse.jdt.internal.ui.viewsupport; import java.util.ArrayList; import java.util.Collections; -import java.util.Comparator; import java.util.jar.Attributes.Name; import org.eclipse.core.runtime.IPath; @@ -564,12 +563,7 @@ public class JavaElementLabelComposer extends JavaElementLabelComposerCore { result.add(pkgAbbr); } - Collections.sort(result, new Comparator<PackageNameAbbreviation>() { - @Override - public int compare(PackageNameAbbreviation a1, PackageNameAbbreviation a2) { - return a2.getPackagePrefix().length() - a1.getPackagePrefix().length(); - } - }); + Collections.sort(result, (a1, a2) -> a2.getPackagePrefix().length() - a1.getPackagePrefix().length()); return result.toArray(new PackageNameAbbreviation[0]); } diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/SelectionListenerWithASTManager.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/SelectionListenerWithASTManager.java index aa8932f0fb..bc73bed603 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/SelectionListenerWithASTManager.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/SelectionListenerWithASTManager.java @@ -28,12 +28,10 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.ISelectionProvider; -import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.text.ITextSelection; import org.eclipse.ui.ISelectionListener; -import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.texteditor.ITextEditor; @@ -80,22 +78,16 @@ public class SelectionListenerWithASTManager { fCurrentJob= null; fAstListeners= new ListenerList<>(ListenerList.IDENTITY); - fSelectionListener= new ISelectionChangedListener() { - @Override - public void selectionChanged(SelectionChangedEvent event) { - ISelection selection= event.getSelection(); - if (selection instanceof ITextSelection) { - fireSelectionChanged((ITextSelection) selection); - } + fSelectionListener= event -> { + ISelection selection= event.getSelection(); + if (selection instanceof ITextSelection) { + fireSelectionChanged((ITextSelection) selection); } }; - fPostSelectionListener= new ISelectionListener() { - @Override - public void selectionChanged(IWorkbenchPart part, ISelection selection) { - if (part == fPart && selection instanceof ITextSelection) - firePostSelectionChanged((ITextSelection) selection); - } + fPostSelectionListener= (part, selection) -> { + if (part == fPart && selection instanceof ITextSelection) + firePostSelectionChanged((ITextSelection) selection); }; } |