Move core.tools.resources to Java 1.8.
Change-Id: I530d897bbeaef3c0823b1da82edc00cad963a4f1
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/bundles/org.eclipse.core.tools.resources/.classpath b/bundles/org.eclipse.core.tools.resources/.classpath
index 9b07f19..aefc433 100644
--- a/bundles/org.eclipse.core.tools.resources/.classpath
+++ b/bundles/org.eclipse.core.tools.resources/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="/org.eclipse.core.resources.spysupport"/>
diff --git a/bundles/org.eclipse.core.tools.resources/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.core.tools.resources/.settings/org.eclipse.jdt.core.prefs
index 3b0191f..5c15bb2 100644
--- a/bundles/org.eclipse.core.tools.resources/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.core.tools.resources/.settings/org.eclipse.jdt.core.prefs
@@ -9,19 +9,23 @@
org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
org.eclipse.jdt.core.compiler.maxProblemPerUnit=1000
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -33,7 +37,7 @@
org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
@@ -70,19 +74,21 @@
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
org.eclipse.jdt.core.compiler.problem.nullReference=warning
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
@@ -92,16 +98,21 @@
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
@@ -119,7 +130,8 @@
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
diff --git a/bundles/org.eclipse.core.tools.resources/META-INF/MANIFEST.MF b/bundles/org.eclipse.core.tools.resources/META-INF/MANIFEST.MF
index 9b533e7..4897475 100644
--- a/bundles/org.eclipse.core.tools.resources/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.core.tools.resources/META-INF/MANIFEST.MF
@@ -2,10 +2,9 @@
Bundle-ManifestVersion: 2
Bundle-Name: Core Resources Tools
Bundle-SymbolicName: org.eclipse.core.tools.resources;singleton:=true
-Bundle-Version: 1.4.200.qualifier
+Bundle-Version: 1.5.0.qualifier
Bundle-Vendor: Eclipse.org
Bundle-Activator: org.eclipse.core.tools.resources.CoreResourcesToolsPlugin
-Bundle-Localization: plugin
Export-Package: org.eclipse.core.tools.resources,
org.eclipse.core.tools.resources.markers
Require-Bundle: org.eclipse.core.resources,
@@ -18,4 +17,5 @@
org.eclipse.ui.views,
org.eclipse.core.tools
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.core.tools.resources
diff --git a/bundles/org.eclipse.core.tools.resources/pom.xml b/bundles/org.eclipse.core.tools.resources/pom.xml
index 5c84da4..964030c 100644
--- a/bundles/org.eclipse.core.tools.resources/pom.xml
+++ b/bundles/org.eclipse.core.tools.resources/pom.xml
@@ -19,7 +19,7 @@
</parent>
<groupId>org.eclipse.core</groupId>
<artifactId>org.eclipse.core.tools.resources</artifactId>
- <version>1.4.200-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
diff --git a/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/CountResourcesAction.java b/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/CountResourcesAction.java
index e846731..3e568b3 100644
--- a/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/CountResourcesAction.java
+++ b/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/CountResourcesAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2015 IBM Corporation and others.
+ * Copyright (c) 2002, 2018 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -64,7 +64,7 @@
@SuppressWarnings("rawtypes")
private List<IResource> getSelectedResources() {
- List<IResource> resources = new LinkedList<IResource>();
+ List<IResource> resources = new LinkedList<>();
ISelectionService selectionService = window.getSelectionService();
ISelection selection = selectionService.getSelection();
diff --git a/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/ElementTreeView.java b/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/ElementTreeView.java
index 472d850..0b9a6df 100644
--- a/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/ElementTreeView.java
+++ b/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/ElementTreeView.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2015 IBM Corporation and others.
+ * Copyright (c) 2002, 2018 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -81,7 +81,7 @@
List<Counter> sortedList;
int stringMemory;
- final Map<String, Counter> strings = new HashMap<String, Counter>();
+ final Map<String, Counter> strings = new HashMap<>();
int syncInfoCount;
int syncInfoMemory;
int teamPrivateCount;
@@ -115,7 +115,7 @@
}
void analyzeStrings() {
- sortedList = new ArrayList<Counter>(strings.values());
+ sortedList = new ArrayList<>(strings.values());
Collections.sort(sortedList);
}
@@ -323,7 +323,7 @@
* objects, in decreasing order by the integer value.
*/
private List<Map.Entry<Object, Integer>> sortEntrySet(Set<Map.Entry<Object, Integer>> set) {
- List<Map.Entry<Object, Integer>> result = new ArrayList<Map.Entry<Object, Integer>>();
+ List<Map.Entry<Object, Integer>> result = new ArrayList<>();
result.addAll(set);
Collections.sort(result, new Comparator<Map.Entry<Object, Integer>>() {
@Override
@@ -355,7 +355,6 @@
buffer.append("\tSync info: " + prettyPrint(syncInfoMemory) + "\n");
buffer.append("\tSession properties: " + prettyPrint(sessionSize) + "\n");
//breakdown of session property size by class
- @SuppressWarnings("unchecked")
List<Map.Entry<Object, Integer>> sortedEntries = sortEntrySet(sessionPropertyMemory.getSizes().entrySet());
for (Map.Entry<Object, Integer> entry : sortedEntries) {
buffer.append("\t\t" + entry.getKey() + ": " + prettyPrint(entry.getValue().intValue()) + "\n");
diff --git a/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/LocalHistoryBrowserView.java b/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/LocalHistoryBrowserView.java
index 59b15fd..47cbd31 100644
--- a/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/LocalHistoryBrowserView.java
+++ b/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/LocalHistoryBrowserView.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2015 IBM Corporation and others.
+ * Copyright (c) 2004, 2018 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -106,7 +106,7 @@
super();
this.parent = parent;
this.name = name;
- this.children = new ArrayList<Object>();
+ this.children = new ArrayList<>();
}
public void addChild(Object child) {
diff --git a/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/ResourceChangeView.java b/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/ResourceChangeView.java
index 0322b0d..2cc0d16 100644
--- a/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/ResourceChangeView.java
+++ b/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/ResourceChangeView.java
@@ -1,5 +1,5 @@
/**********************************************************************
- * Copyright (c) 2002, 2015 Geoff Longman and others.
+ * Copyright (c) 2002, 2018 Geoff Longman and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -43,7 +43,7 @@
private IResource resource;
public DeltaNode() {
- children = new ArrayList<DeltaNode>();
+ children = new ArrayList<>();
}
public DeltaNode(IResourceDelta delta) {
@@ -351,7 +351,7 @@
}
}
- protected Set<Action> eventActions = new HashSet<Action>();
+ protected Set<Action> eventActions = new HashSet<>();
private Action PHANTOMS;
private Action POST_BUILD;
diff --git a/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/markers/MarkerExtensionModel.java b/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/markers/MarkerExtensionModel.java
index c485bbc..dc1be18 100644
--- a/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/markers/MarkerExtensionModel.java
+++ b/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/markers/MarkerExtensionModel.java
@@ -1,5 +1,5 @@
/**********************************************************************
- * Copyright (c) 2003, 2015 Geoff Longman and others.
+ * Copyright (c) 2003, 2018 Geoff Longman and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -52,7 +52,7 @@
static public String RESOURCES_TASK = IMarker.TASK;
static public String RESOURCES_BOOKMARK = IMarker.BOOKMARK;
static public String RESOURCES_TEXT = IMarker.TEXT;
- Map<String, MarkerInfo> markerMap = new HashMap<String, MarkerInfo>();
+ Map<String, MarkerInfo> markerMap = new HashMap<>();
/**
* Constructor for MarkerExtensionHandler.
@@ -97,8 +97,8 @@
IExtension extension = extensions[i];
String identifier = extension.getUniqueIdentifier();
boolean persistent = false;
- ArrayList<String> supersList = new ArrayList<String>();
- ArrayList<String> attributes = new ArrayList<String>();
+ ArrayList<String> supersList = new ArrayList<>();
+ ArrayList<String> attributes = new ArrayList<>();
IConfigurationElement[] configElements = extension.getConfigurationElements();
for (int j = 0; j < configElements.length; ++j) {
IConfigurationElement elt = configElements[j];
diff --git a/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/markers/MarkerView.java b/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/markers/MarkerView.java
index db94230..6588e41 100644
--- a/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/markers/MarkerView.java
+++ b/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/markers/MarkerView.java
@@ -1,5 +1,5 @@
/**********************************************************************
- * Copyright (c) 2003, 2015 Geoff Longman and others.
+ * Copyright (c) 2003, 2018 Geoff Longman and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -73,7 +73,7 @@
protected MarkerViewPropertySheetPage propertyPage;
class SelectionProvider implements ISelectionProvider {
- private List<ISelectionChangedListener> listeners = new ArrayList<ISelectionChangedListener>();
+ private List<ISelectionChangedListener> listeners = new ArrayList<>();
private ISelection selection;
@Override
diff --git a/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/markers/ReadOnlyMarkerPropertySource.java b/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/markers/ReadOnlyMarkerPropertySource.java
index 6c405f6..0782ac8 100644
--- a/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/markers/ReadOnlyMarkerPropertySource.java
+++ b/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/markers/ReadOnlyMarkerPropertySource.java
@@ -1,5 +1,5 @@
/**********************************************************************
- * Copyright (c) 2003, 2015 Geoff Longman and others.
+ * Copyright (c) 2003, 2018 Geoff Longman and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -45,14 +45,14 @@
@Override
public IPropertyDescriptor[] getPropertyDescriptors() {
- ArrayList<PropertyDescriptor> descriptors = new ArrayList<PropertyDescriptor>();
+ ArrayList<PropertyDescriptor> descriptors = new ArrayList<>();
findPropertyDescriptors(descriptors);
return descriptors.toArray(new IPropertyDescriptor[descriptors.size()]);
}
private void findPropertyDescriptors(ArrayList<PropertyDescriptor> descriptorList) {
try {
- Set<String> attributesWithoutDescriptors = new HashSet<String>(marker.getAttributes().keySet());
+ Set<String> attributesWithoutDescriptors = new HashSet<>(marker.getAttributes().keySet());
findDeclaredPropertyDescriptorsFor(info, descriptorList, attributesWithoutDescriptors);
if (!attributesWithoutDescriptors.isEmpty()) {
// we have extra, undeclared attributes.
diff --git a/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/metadata/MarkersDumpingStrategy_1.java b/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/metadata/MarkersDumpingStrategy_1.java
index 164cee4..f14111a 100644
--- a/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/metadata/MarkersDumpingStrategy_1.java
+++ b/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/metadata/MarkersDumpingStrategy_1.java
@@ -46,7 +46,7 @@
@Override
public String dumpStringContents(DataInputStream dataInput) throws IOException, DumpException {
StringBuilder contents = new StringBuilder();
- List<String> markerTypes = new ArrayList<String>();
+ List<String> markerTypes = new ArrayList<>();
while (dataInput.available() > 0) {
String resourceName = dataInput.readUTF();
contents.append("Resource: "); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/metadata/MarkersDumpingStrategy_2.java b/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/metadata/MarkersDumpingStrategy_2.java
index 46c3012..6a3704f 100644
--- a/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/metadata/MarkersDumpingStrategy_2.java
+++ b/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/metadata/MarkersDumpingStrategy_2.java
@@ -46,7 +46,7 @@
@Override
public String dumpStringContents(DataInputStream dataInput) throws IOException, DumpException {
StringBuilder contents = new StringBuilder();
- List<String> markerTypes = new ArrayList<String>();
+ List<String> markerTypes = new ArrayList<>();
while (dataInput.available() > 0) {
String resourceName = dataInput.readUTF();
contents.append("Resource: "); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/metadata/MarkersDumpingStrategy_3.java b/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/metadata/MarkersDumpingStrategy_3.java
index 67c170f..5a11611 100644
--- a/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/metadata/MarkersDumpingStrategy_3.java
+++ b/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/metadata/MarkersDumpingStrategy_3.java
@@ -48,7 +48,7 @@
@Override
public String dumpStringContents(DataInputStream dataInput) throws IOException, DumpException {
StringBuilder contents = new StringBuilder();
- List<String> markerTypes = new ArrayList<String>();
+ List<String> markerTypes = new ArrayList<>();
while (dataInput.available() > 0) {
String resourceName = dataInput.readUTF();
contents.append("Resource: "); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/metadata/MarkersSnapshotDumpingStrategy_1.java b/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/metadata/MarkersSnapshotDumpingStrategy_1.java
index 413bf87..6d9b1b5 100644
--- a/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/metadata/MarkersSnapshotDumpingStrategy_1.java
+++ b/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/metadata/MarkersSnapshotDumpingStrategy_1.java
@@ -48,7 +48,7 @@
public String dumpStringContents(DataInputStream input) throws IOException, DumpException {
StringBuilder contents = new StringBuilder();
DataInputStream dataInput = new DataInputStream(input);
- List<String> markerTypes = new ArrayList<String>();
+ List<String> markerTypes = new ArrayList<>();
String resourceName = dataInput.readUTF();
contents.append("Resource: "); //$NON-NLS-1$
contents.append(resourceName);
diff --git a/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/metadata/MarkersSnapshotDumpingStrategy_2.java b/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/metadata/MarkersSnapshotDumpingStrategy_2.java
index da3429d..3ec6fec 100644
--- a/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/metadata/MarkersSnapshotDumpingStrategy_2.java
+++ b/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/metadata/MarkersSnapshotDumpingStrategy_2.java
@@ -49,7 +49,7 @@
public String dumpStringContents(DataInputStream input) throws IOException, DumpException {
StringBuilder contents = new StringBuilder();
DataInputStream dataInput = new DataInputStream(input);
- List<String> markerTypes = new ArrayList<String>();
+ List<String> markerTypes = new ArrayList<>();
String resourceName = dataInput.readUTF();
contents.append("Resource: "); //$NON-NLS-1$
contents.append(resourceName);
diff --git a/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/metadata/PropertiesIndexDumper.java b/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/metadata/PropertiesIndexDumper.java
index 74d21c6..4b9c710 100644
--- a/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/metadata/PropertiesIndexDumper.java
+++ b/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/metadata/PropertiesIndexDumper.java
@@ -33,7 +33,7 @@
contents.append("entries: ");
contents.append(entryCount);
contents.append('\n');
- List<String> qualifierIndex = new ArrayList<String>();
+ List<String> qualifierIndex = new ArrayList<>();
for (int i = 0; i < entryCount; i++) {
contents.append("Key: ");
contents.append(source.readUTF());
diff --git a/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/metadata/SyncInfoDumpingStrategy_2.java b/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/metadata/SyncInfoDumpingStrategy_2.java
index 904f540..29786cf 100644
--- a/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/metadata/SyncInfoDumpingStrategy_2.java
+++ b/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/metadata/SyncInfoDumpingStrategy_2.java
@@ -39,7 +39,7 @@
@Override
public String dumpStringContents(DataInputStream dataInput) throws IOException, DumpException {
StringBuilder contents = new StringBuilder();
- List<String> readPartners = new ArrayList<String>();
+ List<String> readPartners = new ArrayList<>();
String resourceName;
while (dataInput.available() > 0) {
resourceName = dataInput.readUTF();
diff --git a/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/metadata/SyncInfoDumpingStrategy_3.java b/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/metadata/SyncInfoDumpingStrategy_3.java
index e56e92f..67164e4 100644
--- a/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/metadata/SyncInfoDumpingStrategy_3.java
+++ b/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/metadata/SyncInfoDumpingStrategy_3.java
@@ -39,7 +39,7 @@
@Override
public String dumpStringContents(DataInputStream dataInput) throws IOException, DumpException {
StringBuilder contents = new StringBuilder();
- List<String> readPartners = new ArrayList<String>();
+ List<String> readPartners = new ArrayList<>();
String resourceName;
while (dataInput.available() > 0) {
resourceName = dataInput.readUTF();
