Bug 507946 - Move e.p.releng.buildtools to Java 8
Move o.e.releng.build.tools.convert.
Change-Id: If686c103183175095c24f9f56b28d76df016b8f3
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/bundles/org.eclipse.releng.build.tools.convert/.classpath b/bundles/org.eclipse.releng.build.tools.convert/.classpath
index 64c5e31..eca7bdb 100644
--- a/bundles/org.eclipse.releng.build.tools.convert/.classpath
+++ b/bundles/org.eclipse.releng.build.tools.convert/.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/J2SE-1.5"/>
+ <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="output" path="bin"/>
diff --git a/bundles/org.eclipse.releng.build.tools.convert/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.releng.build.tools.convert/.settings/org.eclipse.jdt.core.prefs
index f5b49f5..be9cc08 100644
--- a/bundles/org.eclipse.releng.build.tools.convert/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.releng.build.tools.convert/.settings/org.eclipse.jdt.core.prefs
@@ -12,13 +12,16 @@
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.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+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
@@ -31,9 +34,9 @@
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=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=ignore
@@ -44,14 +47,14 @@
org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
@@ -59,20 +62,22 @@
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=ignore
org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=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.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
@@ -82,18 +87,19 @@
org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedImport=warning
org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
@@ -106,7 +112,7 @@
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.5
+org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.formatter.align_type_members_on_columns=true
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/bundles/org.eclipse.releng.build.tools.convert/META-INF/MANIFEST.MF b/bundles/org.eclipse.releng.build.tools.convert/META-INF/MANIFEST.MF
index b045278..5793bb6 100644
--- a/bundles/org.eclipse.releng.build.tools.convert/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.releng.build.tools.convert/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@
Bundle-ClassPath: convert.jar
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.apache.ant,
org.eclipse.equinox.app
Export-Package: org.eclipse.releng.build.tools.convert.ant,
diff --git a/bundles/org.eclipse.releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/ant/Converter.java b/bundles/org.eclipse.releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/ant/Converter.java
index ebbdac3..fef2296 100644
--- a/bundles/org.eclipse.releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/ant/Converter.java
+++ b/bundles/org.eclipse.releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/ant/Converter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2016 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -56,24 +56,12 @@
public static final int CURRENT_FORMAT_VERSION = FORMAT_VERSION_2;
- private static final FileFilter XML_FILTER = new FileFilter() {
+ private static final FileFilter XML_FILTER = pathname -> {
+ final String path = pathname.getAbsolutePath().toLowerCase();
+ return path.endsWith(XML_EXTENSION) || pathname.isDirectory();
+ };
- /*
- * (non-Javadoc)
- *
- * @see
- * java.io.FileFilter
- * #
- * accept(java.io
- * .File)
- */
- public boolean accept(final File pathname) {
- final String path = pathname.getAbsolutePath().toLowerCase();
- return path.endsWith(XML_EXTENSION) || pathname.isDirectory();
- }
- };
-
- private static void collectAllFiles(final File root, final ArrayList collector, final FileFilter fileFilter) {
+ private static void collectAllFiles(final File root, final ArrayList<File> collector, final FileFilter fileFilter) {
final File[] files = root.listFiles(fileFilter);
for (int i = 0; i < files.length; i++) {
final File currentFile = files[i];
@@ -86,7 +74,7 @@
}
public static File[] getAllFiles(final File root, final FileFilter fileFilter) {
- final ArrayList files = new ArrayList();
+ final ArrayList<File> files = new ArrayList<>();
if (root.isDirectory()) {
collectAllFiles(root, files, fileFilter);
final File[] result = new File[files.size()];
@@ -111,10 +99,10 @@
converter.parse2();
}
- private final HashMap options;
+ private final HashMap<String, String> options;
public Converter() {
- options = new HashMap();
+ options = new HashMap<>();
}
public void configure(final String[] args) {
@@ -186,7 +174,7 @@
}
}
}
- final String input = (String) options.get(INPUT_SOURCE);
+ final String input = options.get(INPUT_SOURCE);
if (input == null) {
throw new IllegalArgumentException("An input file or directorty is required"); //$NON-NLS-1$
}
@@ -199,14 +187,14 @@
}
private void dump(final LogDocumentNode documentNode) {
- final IDOMConverter converter = ConverterFactory.createDOMConverter(Integer.parseInt((String) options
+ final IDOMConverter converter = ConverterFactory.createDOMConverter(Integer.parseInt(options
.get(Converter.CONVERTER_ID)));
converter.dump(CURRENT_FORMAT_VERSION, options, documentNode);
}
private String extractNameFrom(final String inputFileName) {
final int index = inputFileName.lastIndexOf('.');
- switch (Integer.parseInt((String) options.get(Converter.CONVERTER_ID))) {
+ switch (Integer.parseInt(options.get(Converter.CONVERTER_ID))) {
case ConverterFactory.TXT:
return inputFileName.substring(0, index) + TXT_EXTENSION;
case ConverterFactory.HTML:
@@ -218,12 +206,12 @@
public void parse2() throws ParserConfigurationException {
final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- final boolean validation = Boolean.valueOf((String) options.get(ENABLE_VALIDATION)).booleanValue();
+ final boolean validation = Boolean.valueOf(options.get(ENABLE_VALIDATION)).booleanValue();
factory.setValidating(validation);
factory.setIgnoringElementContentWhitespace(true);
final DocumentBuilder builder = factory.newDocumentBuilder();
- final String inputSourceOption = (String) options.get(INPUT_SOURCE);
+ final String inputSourceOption = options.get(INPUT_SOURCE);
if (options.get(RECURSIVE) != null) {
// collect all xml files and iterate over them
final File sourceDir = new File(inputSourceOption);
diff --git a/bundles/org.eclipse.releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/dom/AbstractDOMConverter.java b/bundles/org.eclipse.releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/dom/AbstractDOMConverter.java
index ecd3d17..b7c0290 100644
--- a/bundles/org.eclipse.releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/dom/AbstractDOMConverter.java
+++ b/bundles/org.eclipse.releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/dom/AbstractDOMConverter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2006, 2016 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -23,13 +23,13 @@
public abstract class AbstractDOMConverter implements IDOMConverter {
- public static final HashSet FILTERED_WARNINGS_IDS;
+ public static final HashSet<String> FILTERED_WARNINGS_IDS;
public static final String FORBIDDEN_REFERENCE = "ForbiddenReference"; //$NON-NLS-1$
public static final String DISCOURAGED_REFERENCE = "DiscouragedReference"; //$NON-NLS-1$
static {
- FILTERED_WARNINGS_IDS = new HashSet();
+ FILTERED_WARNINGS_IDS = new HashSet<>();
FILTERED_WARNINGS_IDS.add(FORBIDDEN_REFERENCE);
FILTERED_WARNINGS_IDS.add(DISCOURAGED_REFERENCE);
}
@@ -63,28 +63,28 @@
return String.valueOf(buffer);
}
- public void dump(final int formatVersion, final Map options, final LogDocumentNode documentNode) {
+ @Override
+ public void dump(final int formatVersion, final Map<String, String> options, final LogDocumentNode documentNode) {
switch (formatVersion) {
case Converter.FORMAT_VERSION_2:
dumpVersion2(options, documentNode);
}
}
- private void dumpVersion2(final Map options, final LogDocumentNode documentNode) {
- final String fileName = (String) options.get(Converter.OUTPUT_FILE_NAME);
+ private void dumpVersion2(final Map<String, String> options, final LogDocumentNode documentNode) {
+ final String fileName = options.get(Converter.OUTPUT_FILE_NAME);
final ProblemSummaryNode summaryNode = documentNode.getSummaryNode();
if ((summaryNode == null) || ((summaryNode.numberOfErrors == 0) && (summaryNode.numberOfWarnings == 0))) {
return;
}
- try {
- final Writer writer = new BufferedWriter(new FileWriter(fileName));
+ try (final Writer writer = new BufferedWriter(new FileWriter(fileName))){
final String pluginName = extractPluginName(fileName);
if (pluginName == null) {
writer.write(messages.getString("header")); //$NON-NLS-1$
} else {
final String pattern = messages.getString("dom_header"); //$NON-NLS-1$
writer.write(MessageFormat.format(pattern,
- new Object[] { pluginName, extractXmlFileName((String) options.get(Converter.INPUT_SOURCE)) }));
+ new Object[] { pluginName, extractXmlFileName(options.get(Converter.INPUT_SOURCE)) }));
}
final ProblemSummaryNode problemSummaryNode = summaryNode;
writeTopAnchor(writer);
@@ -270,9 +270,7 @@
writer.write(messages.getString("footer")); //$NON-NLS-1$
writer.flush();
- writer.close();
- }
- catch (final IOException e) {
+ } catch (final IOException e) {
e.printStackTrace();
}
}
diff --git a/bundles/org.eclipse.releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/dom/DOMHtmlConverter.java b/bundles/org.eclipse.releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/dom/DOMHtmlConverter.java
index c6162dc..facefb9 100644
--- a/bundles/org.eclipse.releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/dom/DOMHtmlConverter.java
+++ b/bundles/org.eclipse.releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/dom/DOMHtmlConverter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2006, 2016 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -22,46 +22,57 @@
messages = new Messages("org.eclipse.releng.build.tools.convert.ant.html_messages"); //$NON-NLS-1$
}
+ @Override
public String getUnderLine(final String sourceBefore, final String sourceOfError) {
return ConverterFactory.EMPTY;
}
+ @Override
public void writeAnchorsReferences(final Writer writer) throws IOException {
writer.write(messages.getString("anchors.references.no_top"));//$NON-NLS-1$
}
+ @Override
public void writeAnchorsReferencesDiscouragedRulesWarnings(final Writer writer) throws IOException {
writer.write(messages.getString("anchors.references.no_discouraged_warnings"));//$NON-NLS-1$
}
+ @Override
public void writeAnchorsReferencesErrors(final Writer writer) throws IOException {
writer.write(messages.getString("anchors.references.no_errors"));//$NON-NLS-1$
}
+ @Override
public void writeAnchorsReferencesForbiddenRulesWarnings(final Writer writer) throws IOException {
writer.write(messages.getString("anchors.references.no_forbidden_warnings"));//$NON-NLS-1$
}
+ @Override
public void writeAnchorsReferencesOtherWarnings(final Writer writer) throws IOException {
writer.write(messages.getString("anchors.references.no_other_warnings"));//$NON-NLS-1$
}
+ @Override
public void writeDiscouragedRulesWarningsAnchor(final Writer writer) throws IOException {
writer.write(messages.getString("discouraged_warnings.title_anchor"));//$NON-NLS-1$
}
+ @Override
public void writeErrorAnchor(final Writer writer) throws IOException {
writer.write(messages.getString("errors.title_anchor"));//$NON-NLS-1$
}
+ @Override
public void writeForbiddenRulesWarningsAnchor(final Writer writer) throws IOException {
writer.write(messages.getString("forbidden_warnings.title_anchor"));//$NON-NLS-1$
}
+ @Override
public void writeOtherWarningsAnchor(final Writer writer) throws IOException {
writer.write(messages.getString("other_warnings.title_anchor"));//$NON-NLS-1$
}
+ @Override
public void writeTopAnchor(final Writer writer) throws IOException {
writer.write(messages.getString("problem.summary.title_anchor"));//$NON-NLS-1$
}
diff --git a/bundles/org.eclipse.releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/dom/DOMTxtConverter.java b/bundles/org.eclipse.releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/dom/DOMTxtConverter.java
index c2b6e0c..e2c9348 100644
--- a/bundles/org.eclipse.releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/dom/DOMTxtConverter.java
+++ b/bundles/org.eclipse.releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/dom/DOMTxtConverter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2006, 2016 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -20,6 +20,7 @@
messages = new Messages("org.eclipse.releng.build.tools.convert.ant.txt_messages"); //$NON-NLS-1$
}
+ @Override
public String getUnderLine(final String sourceBefore, final String sourceOfError) {
final StringBuffer buffer = new StringBuffer();
char[] chars = sourceBefore.toCharArray();
@@ -39,42 +40,52 @@
return String.valueOf(buffer);
}
+ @Override
public void writeAnchorsReferences(final Writer writer) throws IOException {
// do nothing
}
+ @Override
public void writeAnchorsReferencesDiscouragedRulesWarnings(final Writer writer) throws IOException {
// do nothing
}
+ @Override
public void writeAnchorsReferencesErrors(final Writer writer) throws IOException {
// do nothing
}
+ @Override
public void writeAnchorsReferencesForbiddenRulesWarnings(final Writer writer) throws IOException {
// do nothing
}
+ @Override
public void writeAnchorsReferencesOtherWarnings(final Writer writer) throws IOException {
// do nothing
}
+ @Override
public void writeDiscouragedRulesWarningsAnchor(final Writer writer) throws IOException {
// do nothing
}
+ @Override
public void writeErrorAnchor(final Writer writer) throws IOException {
// do nothing
}
+ @Override
public void writeForbiddenRulesWarningsAnchor(final Writer writer) throws IOException {
// do nothing
}
+ @Override
public void writeOtherWarningsAnchor(final Writer writer) throws IOException {
// do nothing
}
+ @Override
public void writeTopAnchor(final Writer writer) throws IOException {
// do nothing
}
diff --git a/bundles/org.eclipse.releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/dom/IDOMConverter.java b/bundles/org.eclipse.releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/dom/IDOMConverter.java
index 779efa5..79ef809 100644
--- a/bundles/org.eclipse.releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/dom/IDOMConverter.java
+++ b/bundles/org.eclipse.releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/dom/IDOMConverter.java
@@ -15,7 +15,7 @@
public interface IDOMConverter {
- void dump(int formatVersion, Map options, LogDocumentNode documentNode);
+ void dump(int formatVersion, Map<String, String> options, LogDocumentNode documentNode);
String getUnderLine(String sourceBefore, String sourceOfError);
diff --git a/bundles/org.eclipse.releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/dom/LogDocumentNode.java b/bundles/org.eclipse.releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/dom/LogDocumentNode.java
index 09a8630..3debc90 100644
--- a/bundles/org.eclipse.releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/dom/LogDocumentNode.java
+++ b/bundles/org.eclipse.releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/dom/LogDocumentNode.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2006, 2016 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -14,13 +14,13 @@
public class LogDocumentNode {
private static final ProblemsNode[] NO_PROBLEM_NODES = new ProblemsNode[0];
- private ArrayList problems;
+ private ArrayList<ProblemsNode> problems;
private ProblemSummaryNode summaryNode;
private ProblemsNode[] problemsNodes;
public void addProblemsNode(final ProblemsNode node) {
if (problems == null) {
- problems = new ArrayList();
+ problems = new ArrayList<>();
}
problems.add(node);
}
diff --git a/bundles/org.eclipse.releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/dom/ProblemsNode.java b/bundles/org.eclipse.releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/dom/ProblemsNode.java
index be271ba..5be9407 100644
--- a/bundles/org.eclipse.releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/dom/ProblemsNode.java
+++ b/bundles/org.eclipse.releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/dom/ProblemsNode.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2006, 2016 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -20,10 +20,10 @@
public int numberOfErrors;
public int numberOfWarnings;
- private ArrayList errorNodes;
- private ArrayList otherWarningNodes;
- private ArrayList discouragedWarningsNodes;
- private ArrayList forbiddenWarningsNodes;
+ private ArrayList<ProblemNode> errorNodes;
+ private ArrayList<ProblemNode> otherWarningNodes;
+ private ArrayList<ProblemNode> discouragedWarningsNodes;
+ private ArrayList<ProblemNode> forbiddenWarningsNodes;
private ProblemNode[] errors;
private ProblemNode[] otherWarnings;
private ProblemNode[] discouragedWarnings;
@@ -31,28 +31,28 @@
public void addDiscouragedWarning(final ProblemNode node) {
if (discouragedWarningsNodes == null) {
- discouragedWarningsNodes = new ArrayList();
+ discouragedWarningsNodes = new ArrayList<>();
}
discouragedWarningsNodes.add(node);
}
public void addError(final ProblemNode node) {
if (errorNodes == null) {
- errorNodes = new ArrayList();
+ errorNodes = new ArrayList<>();
}
errorNodes.add(node);
}
public void addForbiddenWarning(final ProblemNode node) {
if (forbiddenWarningsNodes == null) {
- forbiddenWarningsNodes = new ArrayList();
+ forbiddenWarningsNodes = new ArrayList<>();
}
forbiddenWarningsNodes.add(node);
}
public void addOtherWarning(final ProblemNode node) {
if (otherWarningNodes == null) {
- otherWarningNodes = new ArrayList();
+ otherWarningNodes = new ArrayList<>();
}
otherWarningNodes.add(node);
}
