Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabrice Tiercelin2020-03-26 16:09:00 +0000
committerFabrice Tiercelin2020-03-26 16:09:00 +0000
commit5be1dadbe07e9dbc022006f26bc13030e845e45b (patch)
tree125d78e44b348aab24d5b0f54480d1635909e0eb
parentc1853a088a40b98204bfa78ee3202eddf4928d51 (diff)
downloadeclipse.jdt.ui-5be1dadbe07e9dbc022006f26bc13030e845e45b.tar.gz
eclipse.jdt.ui-5be1dadbe07e9dbc022006f26bc13030e845e45b.tar.xz
eclipse.jdt.ui-5be1dadbe07e9dbc022006f26bc13030e845e45b.zip
Bug 548309 lift java version from 1.4 to 1.8
Change-Id: I037e7712dccdb3876dae22e69383749ab2c64705 Signed-off-by: Fabrice Tiercelin <fabrice.tiercelin@yahoo.fr>
-rw-r--r--org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/CustomCodeFormatterBlock.java7
-rw-r--r--org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/ModifyDialog.java2
-rw-r--r--org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/template/preferences/TemplateVariableProcessor.java7
-rw-r--r--org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleAddExportsBlock.java2
-rw-r--r--org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleAddReadsBlock.java2
-rw-r--r--org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java2
-rw-r--r--org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDialog.java4
-rw-r--r--org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewJavaProjectWizardPageOne.java2
8 files changed, 9 insertions, 19 deletions
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/CustomCodeFormatterBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/CustomCodeFormatterBlock.java
index e6dc7c90d9..debd913b4a 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/CustomCodeFormatterBlock.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/CustomCodeFormatterBlock.java
@@ -196,12 +196,7 @@ public class CustomCodeFormatterBlock extends Observable {
}
}
}
- Collections.sort(formatters, new Comparator<FormatterContribution>() {
- @Override
- public int compare(FormatterContribution o1, FormatterContribution o2) {
- return o1.fName.compareTo(o2.fName);
- }
- });
+ Collections.sort(formatters, Comparator.comparing((FormatterContribution o1) -> o1.fName));
fFormatters= CollectionsUtil.toArray(formatters, FormatterContribution.class);
}
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/ModifyDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/ModifyDialog.java
index 707ba51226..431b2012af 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/ModifyDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/ModifyDialog.java
@@ -902,7 +902,7 @@ public abstract class ModifyDialog extends StatusDialog implements IModification
doValidate();
return true;
};
- ((Preference<?>) node).init(fWorkingValues, validator , () -> valuesModified());
+ ((Preference<?>) node).init(fWorkingValues, validator, ModifyDialog.this::valuesModified);
}
if (!(node instanceof Section)) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/template/preferences/TemplateVariableProcessor.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/template/preferences/TemplateVariableProcessor.java
index 7b6c6e051a..987ab38170 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/template/preferences/TemplateVariableProcessor.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/template/preferences/TemplateVariableProcessor.java
@@ -31,12 +31,7 @@ import org.eclipse.jface.text.templates.TemplateVariableResolver;
public class TemplateVariableProcessor implements IContentAssistProcessor {
- private static Comparator<TemplateVariableProposal> fgTemplateVariableProposalComparator= new Comparator<TemplateVariableProposal>() {
- @Override
- public int compare(TemplateVariableProposal proposal0, TemplateVariableProposal proposal1) {
- return proposal0.getDisplayString().compareTo(proposal1.getDisplayString());
- }
- };
+ private static Comparator<TemplateVariableProposal> fgTemplateVariableProposalComparator= Comparator.comparing(TemplateVariableProposal::getDisplayString);
/** the context type */
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleAddExportsBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleAddExportsBlock.java
index c99a8f8fc0..436b24af95 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleAddExportsBlock.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleAddExportsBlock.java
@@ -107,7 +107,7 @@ public class ModuleAddExportsBlock {
fSourceModuleStatus= new StatusInfo();
fPackageStatus= new StatusInfo();
- IDialogFieldListener adapter= field -> addExportsDialogFieldChanged(field);
+ IDialogFieldListener adapter= this::addExportsDialogFieldChanged;
// create the dialog fields (no widgets yet)
fSourceModule= new StringDialogField();
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleAddReadsBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleAddReadsBlock.java
index b4960f6d5c..5f6fe22b6f 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleAddReadsBlock.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleAddReadsBlock.java
@@ -86,7 +86,7 @@ public class ModuleAddReadsBlock {
fSourceModuleStatus= new StatusInfo();
- IDialogFieldListener adapter= field -> addReadsDialogFieldChanged(field);
+ IDialogFieldListener adapter= this::addReadsDialogFieldChanged;
// create the dialog fields (no widgets yet)
fSourceModule= new StringDialogField();
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java
index 035fd1c808..33be4dc4cb 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java
@@ -222,7 +222,7 @@ public class ModuleDependenciesPage extends BuildPathBasePage {
title.setText(NewWizardMessages.ModuleDependenciesPage_modules_label);
fModuleList.createViewer(left, converter);
- fModuleList.setSelectionChangedListener((elems, mod) -> selectModule(elems, mod));
+ fModuleList.setSelectionChangedListener(this::selectModule);
fAddSystemModuleButton= new Button(left, SWT.NONE);
fAddSystemModuleButton.setText(NewWizardMessages.ModuleDependenciesPage_addSystemModule_button);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDialog.java
index 7a8f0cd49c..532c5d5c81 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDialog.java
@@ -225,11 +225,11 @@ public class ModuleDialog extends StatusDialog {
fIsPatchCheckbox= new SelectionButtonDialogField(SWT.CHECK);
fIsPatchCheckbox.setLabelText(NewWizardMessages.ModuleDialog_patches_module_label);
- fIsPatchCheckbox.setDialogFieldListener(field -> doPatchSelectionChanged(field));
+ fIsPatchCheckbox.setDialogFieldListener(this::doPatchSelectionChanged);
fPatchedModule= new StringDialogField();
fPatchedModule.setLabelText(NewWizardMessages.ModuleDialog_patched_module_label);
- fPatchedModule.setDialogFieldListener(field -> validateDetails(field));
+ fPatchedModule.setDialogFieldListener(this::validateDetails);
fAddExportsList= createDetailListContents(entryToEdit, NewWizardMessages.ModuleDialog_exports_label, new AddExportsAdapter(), ModuleAddExpose.class);
fAddReadsList= createDetailListContents(entryToEdit, NewWizardMessages.ModuleDialog_reads_label, new AddReadsAdapter(), ModuleAddReads.class);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewJavaProjectWizardPageOne.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewJavaProjectWizardPageOne.java
index 82bafed546..ae3418dcd2 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewJavaProjectWizardPageOne.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewJavaProjectWizardPageOne.java
@@ -444,7 +444,7 @@ public class NewJavaProjectWizardPageOne extends WizardPage {
}, Display.getDefault()::asyncExec);
CompletableFuture.runAsync(this::initializeJvmFields)
- .thenAcceptAsync((VOID) -> {
+ .thenAcceptAsync(VOID -> {
if (fGroup.isDisposed()) {
return;
}

Back to the top