update jdt.core to I20221202-1800 for move of ecj to own project

+ move of ot-compiler sources
  - adjust otdt package exports
+ add jdt.annotation optional requirement

16 files changed, 0 insertions, 5860 deletions

diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/BooleanConstant.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/BooleanConstant.java
deleted file mode 100644
index 6f560e34e..000000000
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/BooleanConstant.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.compiler.impl;
-
-public class BooleanConstant extends Constant {
-
-	private boolean value;
-
-	private static final BooleanConstant TRUE = new BooleanConstant(true);
-	private static final BooleanConstant FALSE = new BooleanConstant(false);
-
-	public static Constant fromValue(boolean value) {
-		return value ? BooleanConstant.TRUE : BooleanConstant.FALSE;
-	}
-
-	private BooleanConstant(boolean value) {
-		this.value = value;
-	}
-
-	@Override
-	public boolean booleanValue() {
-		return this.value;
-	}
-
-	@Override
-	public String stringValue() {
-		// spec 15.17.11
-		return String.valueOf(this.value);
-	}
-
-	@Override
-	public String toString() {
-		return "(boolean)" + this.value; //$NON-NLS-1$
-	}
-
-	@Override
-	public int typeID() {
-		return T_boolean;
-	}
-
-	@Override
-	public int hashCode() {
-		return this.value ? 1231 : 1237;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) {
-			return true;
-		}
-		if (obj == null) {
-			return false;
-		}
-		if (getClass() != obj.getClass()) {
-			return false;
-		}
-		// cannot be true anymore as the first test would have returned true
-		return false;
-	}
-}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/ByteConstant.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/ByteConstant.java
deleted file mode 100644
index 91ffe68ae..000000000
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/ByteConstant.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.compiler.impl;
-
-public class ByteConstant extends Constant {
-
-	private byte value;
-
-	public static Constant fromValue(byte value) {
-		return new ByteConstant(value);
-	}
-
-	private ByteConstant(byte value) {
-		this.value = value;
-	}
-
-	@Override
-	public byte byteValue() {
-		return this.value;
-	}
-
-	@Override
-	public char charValue() {
-		return (char) this.value;
-	}
-
-	@Override
-	public double doubleValue() {
-		return this.value; // implicit cast to return type
-	}
-
-	@Override
-	public float floatValue() {
-		return this.value; // implicit cast to return type
-	}
-
-	@Override
-	public int intValue() {
-		return this.value; // implicit cast to return type
-	}
-
-	@Override
-	public long longValue() {
-		return this.value; // implicit cast to return type
-	}
-
-	@Override
-	public short shortValue() {
-		return this.value; // implicit cast to return type
-	}
-
-	@Override
-	public String stringValue() {
-		// spec 15.17.11
-		return String.valueOf(this.value);
-	}
-
-	@Override
-	public String toString() {
-		return "(byte)" + this.value; //$NON-NLS-1$
-	}
-
-	@Override
-	public int typeID() {
-		return T_byte;
-	}
-
-	@Override
-	public int hashCode() {
-		return this.value;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) {
-			return true;
-		}
-		if (obj == null) {
-			return false;
-		}
-		if (getClass() != obj.getClass()) {
-			return false;
-		}
-		ByteConstant other = (ByteConstant) obj;
-		return this.value == other.value;
-	}
-}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CharConstant.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CharConstant.java
deleted file mode 100644
index 0f2c7a1e6..000000000
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CharConstant.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.compiler.impl;
-
-public class CharConstant extends Constant {
-
-	private char value;
-
-	public static Constant fromValue(char value) {
-		return new CharConstant(value);
-	}
-
-	private CharConstant(char value) {
-		this.value = value;
-	}
-
-	@Override
-	public byte byteValue() {
-		return (byte) this.value;
-	}
-
-	@Override
-	public char charValue() {
-		return this.value;
-	}
-
-	@Override
-	public double doubleValue() {
-		return this.value; // implicit cast to return type
-	}
-
-	@Override
-	public float floatValue() {
-		return this.value; // implicit cast to return type
-	}
-
-	@Override
-	public int intValue() {
-		return this.value; // implicit cast to return type
-	}
-
-	@Override
-	public long longValue() {
-		return this.value; // implicit cast to return type
-	}
-
-	@Override
-	public short shortValue() {
-		return (short) this.value;
-	}
-
-	@Override
-	public String stringValue() {
-		// spec 15.17.11
-		return String.valueOf(this.value);
-	}
-
-	@Override
-	public String toString() {
-		return "(char)" + this.value; //$NON-NLS-1$
-	}
-
-	@Override
-	public int typeID() {
-		return T_char;
-	}
-
-	@Override
-	public int hashCode() {
-		return this.value;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) {
-			return true;
-		}
-		if (obj == null) {
-			return false;
-		}
-		if (getClass() != obj.getClass()) {
-			return false;
-		}
-		CharConstant other = (CharConstant) obj;
-		return this.value == other.value;
-	}
-}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
deleted file mode 100644
index 7eff56d5c..000000000
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
+++ /dev/null
@@ -1,2761 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2022 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Benjamin Muskalla - Contribution for bug 239066
- *     Fraunhofer FIRST - extended API and implementation
- *     Technical University Berlin - extended API and implementation
- *     Stephan Herrmann  - Contributions for
- *     							bug 236385 - [compiler] Warn for potential programming problem if an object is created but not used
- *     							bug 295551 - Add option to automatically promote all warnings to errors
- *     							bug 349326 - [1.7] new warning for missing try-with-resources
- *								bug 186342 - [compiler][null] Using annotations for null checking
- *								bug 370639 - [compiler][resource] restore the default for resource leak warnings
- *								bug 366063 - Compiler should not add synthetic @NonNull annotations
- *								bug 374605 - Unreasonable warning for enum-based switch statements
- *								bug 388281 - [compiler][null] inheritance of null annotations as an option
- *								bug 381443 - [compiler][null] Allow parameter widening from @NonNull to unannotated
- *								bug 383368 - [compiler][null] syntactic null analysis for field references
- *								Bug 435805 - [1.8][compiler][null] Java 8 compiler does not recognize declaration style null annotations
- *								Bug 410218 - Optional warning for arguments of "unexpected" types to Map#get(Object), Collection#remove(Object) et al.
- *     Jesper Steen Moller - Contributions for
- *								bug 404146 - [1.7][compiler] nested try-catch-finally-blocks leads to unrunnable Java byte code
- *								bug 407297 - [1.8][compiler] Control generation of parameter names by option
- *******************************************************************************/
-package org.eclipse.jdt.internal.compiler.impl;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jdt.core.compiler.CharOperation;
-import org.eclipse.jdt.internal.compiler.Compiler;
-import org.eclipse.jdt.internal.compiler.ast.ASTNode;
-import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
-import org.eclipse.jdt.internal.compiler.lookup.ExtraCompilerModifiers;
-import org.eclipse.jdt.internal.compiler.problem.ProblemSeverities;
-import org.eclipse.jdt.internal.compiler.util.Util;
-
-/**
- * OTDT changes:
- * 	several new configurable options
- */
-@SuppressWarnings({ "rawtypes", "unchecked" })
-public class CompilerOptions {
-
-	/**
-	 * Option IDs
-	 */
-	public static final String OPTION_LocalVariableAttribute = "org.eclipse.jdt.core.compiler.debug.localVariable"; //$NON-NLS-1$
-	public static final String OPTION_LineNumberAttribute = "org.eclipse.jdt.core.compiler.debug.lineNumber"; //$NON-NLS-1$
-	public static final String OPTION_SourceFileAttribute = "org.eclipse.jdt.core.compiler.debug.sourceFile"; //$NON-NLS-1$
-	public static final String OPTION_PreserveUnusedLocal = "org.eclipse.jdt.core.compiler.codegen.unusedLocal"; //$NON-NLS-1$
-	public static final String OPTION_MethodParametersAttribute = "org.eclipse.jdt.core.compiler.codegen.methodParameters"; //$NON-NLS-1$
-	public static final String OPTION_LambdaGenericSignature = "org.eclipse.jdt.core.compiler.codegen.lambda.genericSignature"; //$NON-NLS-1$
-	public static final String OPTION_DocCommentSupport= "org.eclipse.jdt.core.compiler.doc.comment.support"; //$NON-NLS-1$
-	public static final String OPTION_ReportMethodWithConstructorName = "org.eclipse.jdt.core.compiler.problem.methodWithConstructorName"; //$NON-NLS-1$
-	public static final String OPTION_ReportOverridingPackageDefaultMethod = "org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod"; //$NON-NLS-1$
-	public static final String OPTION_ReportDeprecation = "org.eclipse.jdt.core.compiler.problem.deprecation"; //$NON-NLS-1$
-	public static final String OPTION_ReportTerminalDeprecation = "org.eclipse.jdt.core.compiler.problem.terminalDeprecation"; //$NON-NLS-1$
-	public static final String OPTION_ReportDeprecationInDeprecatedCode = "org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode"; //$NON-NLS-1$
-	public static final String OPTION_ReportDeprecationWhenOverridingDeprecatedMethod = "org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod"; //$NON-NLS-1$
-	public static final String OPTION_ReportHiddenCatchBlock = "org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock"; //$NON-NLS-1$
-	public static final String OPTION_ReportUnusedLocal = "org.eclipse.jdt.core.compiler.problem.unusedLocal"; //$NON-NLS-1$
-	public static final String OPTION_ReportUnusedParameter = "org.eclipse.jdt.core.compiler.problem.unusedParameter"; //$NON-NLS-1$
-	public static final String OPTION_ReportUnusedExceptionParameter = "org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter"; //$NON-NLS-1$
-	public static final String OPTION_ReportUnusedParameterWhenImplementingAbstract = "org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract"; //$NON-NLS-1$
-	public static final String OPTION_ReportUnusedParameterWhenOverridingConcrete = "org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete"; //$NON-NLS-1$
-	public static final String OPTION_ReportUnusedParameterIncludeDocCommentReference = "org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference"; //$NON-NLS-1$
-	public static final String OPTION_ReportUnusedImport = "org.eclipse.jdt.core.compiler.problem.unusedImport"; //$NON-NLS-1$
-	public static final String OPTION_ReportSyntheticAccessEmulation = "org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation"; //$NON-NLS-1$
-	public static final String OPTION_ReportNoEffectAssignment = "org.eclipse.jdt.core.compiler.problem.noEffectAssignment"; //$NON-NLS-1$
-	public static final String OPTION_ReportLocalVariableHiding = "org.eclipse.jdt.core.compiler.problem.localVariableHiding"; //$NON-NLS-1$
-	public static final String OPTION_ReportSpecialParameterHidingField = "org.eclipse.jdt.core.compiler.problem.specialParameterHidingField"; //$NON-NLS-1$
-	public static final String OPTION_ReportFieldHiding = "org.eclipse.jdt.core.compiler.problem.fieldHiding"; //$NON-NLS-1$
-	public static final String OPTION_ReportTypeParameterHiding = "org.eclipse.jdt.core.compiler.problem.typeParameterHiding"; //$NON-NLS-1$
-	public static final String OPTION_ReportPossibleAccidentalBooleanAssignment = "org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment"; //$NON-NLS-1$
-	public static final String OPTION_ReportNonExternalizedStringLiteral = "org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral"; //$NON-NLS-1$
-	public static final String OPTION_ReportIncompatibleNonInheritedInterfaceMethod = "org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod"; //$NON-NLS-1$
-	public static final String OPTION_ReportUnusedPrivateMember = "org.eclipse.jdt.core.compiler.problem.unusedPrivateMember"; //$NON-NLS-1$
-	public static final String OPTION_ReportNoImplicitStringConversion = "org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion"; //$NON-NLS-1$
-	public static final String OPTION_ReportAssertIdentifier = "org.eclipse.jdt.core.compiler.problem.assertIdentifier"; //$NON-NLS-1$
-	public static final String OPTION_ReportEnumIdentifier = "org.eclipse.jdt.core.compiler.problem.enumIdentifier"; //$NON-NLS-1$
-	public static final String OPTION_ReportNonStaticAccessToStatic = "org.eclipse.jdt.core.compiler.problem.staticAccessReceiver"; //$NON-NLS-1$
-	public static final String OPTION_ReportIndirectStaticAccess = "org.eclipse.jdt.core.compiler.problem.indirectStaticAccess"; //$NON-NLS-1$
-	public static final String OPTION_ReportEmptyStatement = "org.eclipse.jdt.core.compiler.problem.emptyStatement"; //$NON-NLS-1$
-	public static final String OPTION_ReportUnnecessaryTypeCheck = "org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck"; //$NON-NLS-1$
-	public static final String OPTION_ReportUnnecessaryElse = "org.eclipse.jdt.core.compiler.problem.unnecessaryElse"; //$NON-NLS-1$
-	public static final String OPTION_ReportUndocumentedEmptyBlock = "org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock"; //$NON-NLS-1$
-	public static final String OPTION_ReportInvalidJavadoc = "org.eclipse.jdt.core.compiler.problem.invalidJavadoc"; //$NON-NLS-1$
-	public static final String OPTION_ReportInvalidJavadocTags = "org.eclipse.jdt.core.compiler.problem.invalidJavadocTags"; //$NON-NLS-1$
-	public static final String OPTION_ReportInvalidJavadocTagsDeprecatedRef = "org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef"; //$NON-NLS-1$
-	public static final String OPTION_ReportInvalidJavadocTagsNotVisibleRef = "org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef"; //$NON-NLS-1$
-	public static final String OPTION_ReportInvalidJavadocTagsVisibility = "org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility"; //$NON-NLS-1$
-	public static final String OPTION_ReportMissingJavadocTags = "org.eclipse.jdt.core.compiler.problem.missingJavadocTags"; //$NON-NLS-1$
-	public static final String OPTION_ReportMissingJavadocTagsVisibility = "org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility"; //$NON-NLS-1$
-	public static final String OPTION_ReportMissingJavadocTagsOverriding = "org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding"; //$NON-NLS-1$
-	public static final String OPTION_ReportMissingJavadocTagsMethodTypeParameters = "org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters"; //$NON-NLS-1$
-	public static final String OPTION_ReportMissingJavadocComments = "org.eclipse.jdt.core.compiler.problem.missingJavadocComments"; //$NON-NLS-1$
-	public static final String OPTION_ReportMissingJavadocTagDescription = "org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription"; //$NON-NLS-1$
-	public static final String OPTION_ReportMissingJavadocCommentsVisibility = "org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility"; //$NON-NLS-1$
-	public static final String OPTION_ReportMissingJavadocCommentsOverriding = "org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding"; //$NON-NLS-1$
-	public static final String OPTION_ReportFinallyBlockNotCompletingNormally = "org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally"; //$NON-NLS-1$
-	public static final String OPTION_ReportUnusedDeclaredThrownException = "org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException"; //$NON-NLS-1$
-	public static final String OPTION_ReportUnusedDeclaredThrownExceptionWhenOverriding = "org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding"; //$NON-NLS-1$
-	public static final String OPTION_ReportUnusedDeclaredThrownExceptionIncludeDocCommentReference = "org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference"; //$NON-NLS-1$
-	public static final String OPTION_ReportUnusedDeclaredThrownExceptionExemptExceptionAndThrowable = "org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable"; //$NON-NLS-1$
-	public static final String OPTION_ReportUnqualifiedFieldAccess = "org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess"; //$NON-NLS-1$
-	public static final String OPTION_ReportUnavoidableGenericTypeProblems = "org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems"; //$NON-NLS-1$
-	public static final String OPTION_ReportUncheckedTypeOperation = "org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation"; //$NON-NLS-1$
-	public static final String OPTION_ReportRawTypeReference =  "org.eclipse.jdt.core.compiler.problem.rawTypeReference"; //$NON-NLS-1$
-	public static final String OPTION_ReportFinalParameterBound = "org.eclipse.jdt.core.compiler.problem.finalParameterBound"; //$NON-NLS-1$
-	public static final String OPTION_ReportMissingSerialVersion = "org.eclipse.jdt.core.compiler.problem.missingSerialVersion"; //$NON-NLS-1$
-	public static final String OPTION_ReportVarargsArgumentNeedCast = "org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast"; //$NON-NLS-1$
-	public static final String OPTION_ReportUnusedTypeArgumentsForMethodInvocation = "org.eclipse.jdt.core.compiler.problem.unusedTypeArgumentsForMethodInvocation"; //$NON-NLS-1$
-	public static final String OPTION_Source = "org.eclipse.jdt.core.compiler.source"; //$NON-NLS-1$
-	public static final String OPTION_TargetPlatform = "org.eclipse.jdt.core.compiler.codegen.targetPlatform"; //$NON-NLS-1$
-	public static final String OPTION_Compliance = "org.eclipse.jdt.core.compiler.compliance"; //$NON-NLS-1$
-	public static final String OPTION_Release = "org.eclipse.jdt.core.compiler.release"; //$NON-NLS-1$
-	public static final String OPTION_Encoding = "org.eclipse.jdt.core.encoding"; //$NON-NLS-1$
-	public static final String OPTION_MaxProblemPerUnit = "org.eclipse.jdt.core.compiler.maxProblemPerUnit"; //$NON-NLS-1$
-	public static final String OPTION_TaskTags = "org.eclipse.jdt.core.compiler.taskTags"; //$NON-NLS-1$
-	public static final String OPTION_TaskPriorities = "org.eclipse.jdt.core.compiler.taskPriorities"; //$NON-NLS-1$
-	public static final String OPTION_TaskCaseSensitive = "org.eclipse.jdt.core.compiler.taskCaseSensitive"; //$NON-NLS-1$
-	public static final String OPTION_InlineJsr = "org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode"; //$NON-NLS-1$
-	public static final String OPTION_ShareCommonFinallyBlocks = "org.eclipse.jdt.core.compiler.codegen.shareCommonFinallyBlocks"; //$NON-NLS-1$
-	public static final String OPTION_ReportNullReference = "org.eclipse.jdt.core.compiler.problem.nullReference"; //$NON-NLS-1$
-	public static final String OPTION_ReportPotentialNullReference = "org.eclipse.jdt.core.compiler.problem.potentialNullReference"; //$NON-NLS-1$
-	public static final String OPTION_ReportRedundantNullCheck = "org.eclipse.jdt.core.compiler.problem.redundantNullCheck"; //$NON-NLS-1$
-	public static final String OPTION_ReportAutoboxing = "org.eclipse.jdt.core.compiler.problem.autoboxing"; //$NON-NLS-1$
-	public static final String OPTION_ReportAnnotationSuperInterface = "org.eclipse.jdt.core.compiler.problem.annotationSuperInterface"; //$NON-NLS-1$
-	public static final String OPTION_ReportMissingOverrideAnnotation = "org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation"; //$NON-NLS-1$
-	public static final String OPTION_ReportMissingOverrideAnnotationForInterfaceMethodImplementation = "org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation"; //$NON-NLS-1$
-	public static final String OPTION_ReportMissingDeprecatedAnnotation = "org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation"; //$NON-NLS-1$
-	public static final String OPTION_ReportIncompleteEnumSwitch = "org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch"; //$NON-NLS-1$
-	public static final String OPTION_ReportMissingEnumCaseDespiteDefault = "org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault"; //$NON-NLS-1$
-	public static final String OPTION_ReportMissingDefaultCase = "org.eclipse.jdt.core.compiler.problem.missingDefaultCase"; //$NON-NLS-1$
-	public static final String OPTION_ReportForbiddenReference =  "org.eclipse.jdt.core.compiler.problem.forbiddenReference"; //$NON-NLS-1$
-	public static final String OPTION_ReportDiscouragedReference =  "org.eclipse.jdt.core.compiler.problem.discouragedReference"; //$NON-NLS-1$
-	public static final String OPTION_SuppressWarnings =  "org.eclipse.jdt.core.compiler.problem.suppressWarnings"; //$NON-NLS-1$
-	public static final String OPTION_SuppressOptionalErrors = "org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors"; //$NON-NLS-1$
-	public static final String OPTION_ReportUnhandledWarningToken =  "org.eclipse.jdt.core.compiler.problem.unhandledWarningToken"; //$NON-NLS-1$
-	public static final String OPTION_ReportUnusedTypeParameter =  "org.eclipse.jdt.core.compiler.problem.unusedTypeParameter"; //$NON-NLS-1$
-	public static final String OPTION_ReportUnusedWarningToken =  "org.eclipse.jdt.core.compiler.problem.unusedWarningToken"; //$NON-NLS-1$
-	public static final String OPTION_ReportUnusedLabel =  "org.eclipse.jdt.core.compiler.problem.unusedLabel"; //$NON-NLS-1$
-	public static final String OPTION_FatalOptionalError =  "org.eclipse.jdt.core.compiler.problem.fatalOptionalError"; //$NON-NLS-1$
-	public static final String OPTION_ReportParameterAssignment =  "org.eclipse.jdt.core.compiler.problem.parameterAssignment"; //$NON-NLS-1$
-	public static final String OPTION_ReportFallthroughCase =  "org.eclipse.jdt.core.compiler.problem.fallthroughCase"; //$NON-NLS-1$
-	public static final String OPTION_ReportOverridingMethodWithoutSuperInvocation =  "org.eclipse.jdt.core.compiler.problem.overridingMethodWithoutSuperInvocation"; //$NON-NLS-1$
-	public static final String OPTION_GenerateClassFiles = "org.eclipse.jdt.core.compiler.generateClassFiles"; //$NON-NLS-1$
-	public static final String OPTION_Process_Annotations = "org.eclipse.jdt.core.compiler.processAnnotations"; //$NON-NLS-1$
-	// OPTION_Store_Annotations: undocumented option for testing purposes
-	public static final String OPTION_Store_Annotations = "org.eclipse.jdt.core.compiler.storeAnnotations"; //$NON-NLS-1$
-	public static final String OPTION_EmulateJavacBug8031744 = "org.eclipse.jdt.core.compiler.emulateJavacBug8031744"; //$NON-NLS-1$
-	public static final String OPTION_ReportRedundantSuperinterface =  "org.eclipse.jdt.core.compiler.problem.redundantSuperinterface"; //$NON-NLS-1$
-	public static final String OPTION_ReportComparingIdentical =  "org.eclipse.jdt.core.compiler.problem.comparingIdentical"; //$NON-NLS-1$
-	public static final String OPTION_ReportMissingSynchronizedOnInheritedMethod =  "org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod"; //$NON-NLS-1$
-	public static final String OPTION_ReportMissingHashCodeMethod =  "org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod"; //$NON-NLS-1$
-	public static final String OPTION_ReportDeadCode =  "org.eclipse.jdt.core.compiler.problem.deadCode"; //$NON-NLS-1$
-	public static final String OPTION_ReportDeadCodeInTrivialIfStatement =  "org.eclipse.jdt.core.compiler.problem.deadCodeInTrivialIfStatement"; //$NON-NLS-1$
-	public static final String OPTION_ReportTasks = "org.eclipse.jdt.core.compiler.problem.tasks"; //$NON-NLS-1$
-	public static final String OPTION_ReportUnusedObjectAllocation = "org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation";  //$NON-NLS-1$
-	public static final String OPTION_IncludeNullInfoFromAsserts = "org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts";  //$NON-NLS-1$
-	public static final String OPTION_ReportMethodCanBeStatic = "org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic";  //$NON-NLS-1$
-	public static final String OPTION_ReportMethodCanBePotentiallyStatic = "org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic";  //$NON-NLS-1$
-	public static final String OPTION_ReportRedundantSpecificationOfTypeArguments =  "org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments"; //$NON-NLS-1$
-
-	public static final String OPTION_ReportUnclosedCloseable = "org.eclipse.jdt.core.compiler.problem.unclosedCloseable"; //$NON-NLS-1$
-	public static final String OPTION_ReportPotentiallyUnclosedCloseable = "org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable"; //$NON-NLS-1$
-	public static final String OPTION_ReportExplicitlyClosedAutoCloseable = "org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable"; //$NON-NLS-1$
-
-//{ObjectTeams: sync with constants in OTDTPlugin:
-	public static final String OPTION_ReportNotExactlyOneBasecall =
-		"org.eclipse.objectteams.otdt.compiler.problem.basecall"; //$NON-NLS-1$
-	public static final String OPTION_ReportBaseclassCycle =
-		"org.eclipse.objectteams.otdt.compiler.problem.baseclass_cycle";  //$NON-NLS-1$
-	public static final String OPTION_ReportUnsafeRoleInstantiation   =
-		"org.eclipse.objectteams.otdt.compiler.problem.unsafe_role_instantiation"; //$NON-NLS-1$
-
-	public static final String OPTION_ReportEffectlessFieldaccess =
-		"org.eclipse.objectteams.otdt.compiler.problem.effectless_fieldaccess"; //$NON-NLS-1$
-	public static final String OPTION_ReportFragileCallin =
-		"org.eclipse.objectteams.otdt.compiler.problem.fragile_callin"; //$NON-NLS-1$
-    public static final String OPTION_ReportUnusedParammap =
-    	"org.eclipse.objectteams.otdt.compiler.problem.unused_parammap"; //$NON-NLS-1$
-
-	public static final String OPTION_ReportPotentialAmbiguousPlayedby =
-		"org.eclipse.objectteams.otdt.compiler.problem.potential_ambiguous_playedby"; //$NON-NLS-1$
-	public static final String OPTION_ReportAbstractPotentialRelevantRole =
-		"org.eclipse.objectteams.otdt.compiler.problem.abstract_potential_relevant_role"; //$NON-NLS-1$
-	public static final String OPTION_ReportHiddenLiftingProblem =
-		"org.eclipse.objectteams.otdt.compiler.problem.hidden_lifting_problem";  //$NON-NLS-1$
-
-	public static final String OPTION_ReportDecapsulation =
-		"org.eclipse.objectteams.otdt.compiler.problem.decapsulation"; //$NON-NLS-1$
-	public static final String OPTION_ReportDecapsulationWrite =
-		"org.eclipse.objectteams.otdt.compiler.problem.decapsulation_write"; //$NON-NLS-1$
-
-	public static final String OPTION_ReportBindingConventions =
-		"org.eclipse.objectteams.otdt.compiler.problem.binding_conventions"; //$NON-NLS-1$
-
-	public static final String OPTION_ReportInferredCallout =
-		"org.eclipse.objectteams.otdt.compiler.problem.inferred_callout"; //$NON-NLS-1$
-
-	public static final String OPTION_ReportDeprecatedPathSyntax =
-		"org.eclipse.objectteams.otdt.compiler.problem.deprecated_path_syntax"; //$NON-NLS-1$
-
-	public static final String OPTION_ReportWeaveIntoSystemClass =
-		"org.eclipse.objectteams.otdt.compiler.problem.weave_into_system_class"; //$NON-NLS-1$
-
-	public static final String OPTION_ReportOverrideFinalRole=
-		"org.eclipse.objectteams.otdt.compiler.problem.override_final_role"; //$NON-NLS-1$
-
-	public static final String OPTION_ReportExceptionInGuard=
-		"org.eclipse.objectteams.otdt.compiler.problem.exception_in_guard"; //$NON-NLS-1$
-
-	public static final String OPTION_ReportAmbiguousLowering=
-		"org.eclipse.objectteams.otdt.compiler.problem.ambiguous_lowering"; //$NON-NLS-1$
-
-	public static final String OPTION_ReportAdaptingDeprecated=
-		"org.eclipse.objectteams.otdt.compiler.problem.adapting_deprecated"; //$NON-NLS-1$
-
-	public static final String OPTION_ReportIgnoringRoleMethodReturn=
-		"org.eclipse.objectteams.otdt.compiler.problem.ignoring_role_return"; //$NON-NLS-1$
-
-	public static final String OPTION_ReportOtreWeavingIntoJava8=
-		"org.eclipse.objectteams.otdt.compiler.problem.otre_into_java8"; //$NON-NLS-1$
-
-	public static final String OPTION_AllowScopedKeywords =
-		"org.eclipse.objectteams.otdt.compiler.option.scoped_keywords"; //$NON-NLS-1$
-
-	public static final String OPTION_PureJavaOnly =
-		"org.eclipse.objectteams.otdt.compiler.option.pure_java"; //$NON-NLS-1$ // not for explicit configuration, set from project nature
-
-	// === multi value options ===:
-
-	public static final String OPTION_WeavingScheme =
-		"org.eclipse.objectteams.otdt.compiler.option.weaving_scheme"; //$NON-NLS-1$
-	/** Supported weaving schemes. */
-	public static enum WeavingScheme {
-		/** Code generation for the traditional "Object Teams Runtime Environment" implementation based on BCEL. */
-		OTRE,
-		/** Code generation for the newer "Object Teams Dynamic Runtime Environment" implementation based on ASM. */
-		OTDRE
-	}
-
-
-	public static final String OPTION_Decapsulation = "org.eclipse.objectteams.otdt.core.compiler.problem.decapsulation"; //$NON-NLS-1$
-	// values for the above:
-	public static final String REPORT_CLASS = "report class"; //$NON-NLS-1$
-	public static final String REPORT_BINDING = "report binding"; //$NON-NLS-1$
-	public static final String REPORT_NONE = "report none"; //$NON-NLS-1$
-// SH}
-
-	public static final String OPTION_ReportNullSpecViolation = "org.eclipse.jdt.core.compiler.problem.nullSpecViolation";  //$NON-NLS-1$
-	public static final String OPTION_ReportNullAnnotationInferenceConflict = "org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict";  //$NON-NLS-1$
-	public static final String OPTION_ReportNullUncheckedConversion = "org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion";  //$NON-NLS-1$
-	public static final String OPTION_ReportRedundantNullAnnotation = "org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation";  //$NON-NLS-1$
-	public static final String OPTION_AnnotationBasedNullAnalysis = "org.eclipse.jdt.core.compiler.annotation.nullanalysis"; //$NON-NLS-1$
-	public static final String OPTION_NullableAnnotationName = "org.eclipse.jdt.core.compiler.annotation.nullable"; //$NON-NLS-1$
-	public static final String OPTION_NonNullAnnotationName = "org.eclipse.jdt.core.compiler.annotation.nonnull"; //$NON-NLS-1$
-	public static final String OPTION_NonNullByDefaultAnnotationName = "org.eclipse.jdt.core.compiler.annotation.nonnullbydefault"; //$NON-NLS-1$
-	public static final String OPTION_NullableAnnotationSecondaryNames = "org.eclipse.jdt.core.compiler.annotation.nullable.secondary"; //$NON-NLS-1$
-	public static final String OPTION_NonNullAnnotationSecondaryNames = "org.eclipse.jdt.core.compiler.annotation.nonnull.secondary"; //$NON-NLS-1$
-	public static final String OPTION_NonNullByDefaultAnnotationSecondaryNames = "org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary"; //$NON-NLS-1$
-	public static final String OPTION_ReportUninternedIdentityComparison = "org.eclipse.jdt.core.compiler.problem.uninternedIdentityComparison"; //$NON-NLS-1$
-	// defaults for the above:
-	static final char[][] DEFAULT_NULLABLE_ANNOTATION_NAME = CharOperation.splitOn('.', "org.eclipse.jdt.annotation.Nullable".toCharArray()); //$NON-NLS-1$
-	static final char[][] DEFAULT_NONNULL_ANNOTATION_NAME = CharOperation.splitOn('.', "org.eclipse.jdt.annotation.NonNull".toCharArray()); //$NON-NLS-1$
-	static final char[][] DEFAULT_NONNULLBYDEFAULT_ANNOTATION_NAME = CharOperation.splitOn('.', "org.eclipse.jdt.annotation.NonNullByDefault".toCharArray()); //$NON-NLS-1$
-	public static final String OPTION_ReportMissingNonNullByDefaultAnnotation = "org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation";  //$NON-NLS-1$
-	public static final String OPTION_SyntacticNullAnalysisForFields = "org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields"; //$NON-NLS-1$
-	public static final String OPTION_InheritNullAnnotations = "org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations";  //$NON-NLS-1$
-	public static final String OPTION_ReportNonnullParameterAnnotationDropped = "org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped";  //$NON-NLS-1$
-	public static final String OPTION_PessimisticNullAnalysisForFreeTypeVariables = "org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables";  //$NON-NLS-1$
-	public static final String OPTION_ReportNonNullTypeVariableFromLegacyInvocation = "org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation"; //$NON-NLS-1$
-	public static final String OPTION_ReportAnnotatedTypeArgumentToUnannotated = "org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated"; //$NON-NLS-1$
-
-	public static final String OPTION_ReportUnlikelyCollectionMethodArgumentType = "org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType"; //$NON-NLS-1$
-	public static final String OPTION_ReportUnlikelyCollectionMethodArgumentTypeStrict = "org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict"; //$NON-NLS-1$
-	public static final String OPTION_ReportUnlikelyEqualsArgumentType = "org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType"; //$NON-NLS-1$
-
-	public static final String OPTION_ReportAPILeak = "org.eclipse.jdt.core.compiler.problem.APILeak"; //$NON-NLS-1$
-	public static final String OPTION_ReportUnstableAutoModuleName = "org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName";   //$NON-NLS-1$
-
-	public static final String OPTION_EnablePreviews = "org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures"; //$NON-NLS-1$
-	public static final String OPTION_ReportPreviewFeatures = "org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures"; //$NON-NLS-1$
-
-	public static final String OPTION_ReportSuppressWarningNotFullyAnalysed = "org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed";  //$NON-NLS-1$
-
-	// Internally used option to allow debug framework compile evaluation snippets in context of modules, see bug 543604
-	public static final String OPTION_JdtDebugCompileMode = "org.eclipse.jdt.internal.debug.compile.mode"; //$NON-NLS-1$
-
-	public static final String OPTION_IgnoreUnnamedModuleForSplitPackage = "org.eclipse.jdt.core.compiler.ignoreUnnamedModuleForSplitPackage"; //$NON-NLS-1$
-
-	/**
-	 * Possible values for configurable options
-	 */
-	public static final String GENERATE = "generate";//$NON-NLS-1$
-	public static final String DO_NOT_GENERATE = "do not generate"; //$NON-NLS-1$
-	public static final String PRESERVE = "preserve"; //$NON-NLS-1$
-	public static final String OPTIMIZE_OUT = "optimize out"; //$NON-NLS-1$
-	public static final String VERSION_1_1 = "1.1"; //$NON-NLS-1$
-	public static final String VERSION_1_2 = "1.2"; //$NON-NLS-1$
-	public static final String VERSION_1_3 = "1.3"; //$NON-NLS-1$
-	public static final String VERSION_1_4 = "1.4"; //$NON-NLS-1$
-	public static final String VERSION_JSR14 = "jsr14"; //$NON-NLS-1$
-	public static final String VERSION_CLDC1_1 = "cldc1.1"; //$NON-NLS-1$
-	public static final String VERSION_1_5 = "1.5"; //$NON-NLS-1$
-	public static final String VERSION_1_6 = "1.6"; //$NON-NLS-1$
-	public static final String VERSION_1_7 = "1.7"; //$NON-NLS-1$
-	public static final String VERSION_1_8 = "1.8"; //$NON-NLS-1$
-	public static final String VERSION_9 = "9"; //$NON-NLS-1$
-	public static final String VERSION_10 = "10"; //$NON-NLS-1$
-	public static final String VERSION_11 = "11"; //$NON-NLS-1$
-	public static final String VERSION_12 = "12"; //$NON-NLS-1$
-	public static final String VERSION_13 = "13"; //$NON-NLS-1$
-	public static final String VERSION_14 = "14"; //$NON-NLS-1$
-	public static final String VERSION_15 = "15"; //$NON-NLS-1$
-	public static final String VERSION_16 = "16"; //$NON-NLS-1$
-	public static final String VERSION_17 = "17"; //$NON-NLS-1$
-	public static final String VERSION_18 = "18"; //$NON-NLS-1$
-	public static final String VERSION_19 = "19"; //$NON-NLS-1$
-	/*
-	 * Note: Whenever a new version is added, make sure getLatestVersion()
-	 * is updated with it.
-	 */
-	public static final String ERROR = "error"; //$NON-NLS-1$
-	public static final String WARNING = "warning"; //$NON-NLS-1$
-	public static final String INFO = "info"; //$NON-NLS-1$
-	public static final String IGNORE = "ignore"; //$NON-NLS-1$
-	public static final String ENABLED = "enabled"; //$NON-NLS-1$
-	public static final String DISABLED = "disabled"; //$NON-NLS-1$
-	public static final String PUBLIC = "public";	//$NON-NLS-1$
-	public static final String PROTECTED = "protected";	//$NON-NLS-1$
-	public static final String DEFAULT = "default";	//$NON-NLS-1$
-	public static final String PRIVATE = "private";	//$NON-NLS-1$
-	public static final String RETURN_TAG = "return_tag";	//$NON-NLS-1$
-	public static final String NO_TAG = "no_tag";	//$NON-NLS-1$
-	public static final String ALL_STANDARD_TAGS = "all_standard_tags";	//$NON-NLS-1$
-
-	private static final String[] NO_STRINGS = new String[0];
-
-	/**
-	 * Bit mask for configurable problems (error/warning threshold)
-	 * Note: bitmask assumes 3 highest bits to denote irritant group (to allow storing 8 groups of 29 bits each
-	 */
-	// group 0
-	public static final int MethodWithConstructorName = IrritantSet.GROUP0 | ASTNode.Bit1;
-	public static final int OverriddenPackageDefaultMethod = IrritantSet.GROUP0 | ASTNode.Bit2;
-	public static final int UsingDeprecatedAPI = IrritantSet.GROUP0 | ASTNode.Bit3;
-	public static final int MaskedCatchBlock = IrritantSet.GROUP0 | ASTNode.Bit4;
-	public static final int UnusedLocalVariable = IrritantSet.GROUP0 | ASTNode.Bit5;
-	public static final int UnusedArgument = IrritantSet.GROUP0 | ASTNode.Bit6;
-	public static final int NoImplicitStringConversion = IrritantSet.GROUP0 | ASTNode.Bit7;
-	public static final int AccessEmulation = IrritantSet.GROUP0 | ASTNode.Bit8;
-	public static final int NonExternalizedString = IrritantSet.GROUP0 | ASTNode.Bit9;
-	public static final int AssertUsedAsAnIdentifier = IrritantSet.GROUP0 | ASTNode.Bit10;
-	public static final int UnusedImport = IrritantSet.GROUP0 | ASTNode.Bit11;
-	public static final int NonStaticAccessToStatic = IrritantSet.GROUP0 | ASTNode.Bit12;
-	public static final int Task = IrritantSet.GROUP0 | ASTNode.Bit13;
-	public static final int NoEffectAssignment = IrritantSet.GROUP0 | ASTNode.Bit14;
-	public static final int IncompatibleNonInheritedInterfaceMethod = IrritantSet.GROUP0 | ASTNode.Bit15;
-	public static final int UnusedPrivateMember = IrritantSet.GROUP0 | ASTNode.Bit16;
-	public static final int LocalVariableHiding = IrritantSet.GROUP0 | ASTNode.Bit17;
-	public static final int FieldHiding = IrritantSet.GROUP0 | ASTNode.Bit18;
-	public static final int AccidentalBooleanAssign = IrritantSet.GROUP0 | ASTNode.Bit19;
-	public static final int EmptyStatement = IrritantSet.GROUP0 | ASTNode.Bit20;
-	public static final int MissingJavadocComments  = IrritantSet.GROUP0 | ASTNode.Bit21;
-	public static final int MissingJavadocTags = IrritantSet.GROUP0 | ASTNode.Bit22;
-	public static final int UnqualifiedFieldAccess = IrritantSet.GROUP0 | ASTNode.Bit23;
-	public static final int UnusedDeclaredThrownException = IrritantSet.GROUP0 | ASTNode.Bit24;
-	public static final int FinallyBlockNotCompleting = IrritantSet.GROUP0 | ASTNode.Bit25;
-	public static final int InvalidJavadoc = IrritantSet.GROUP0 | ASTNode.Bit26;
-	public static final int UnnecessaryTypeCheck = IrritantSet.GROUP0 | ASTNode.Bit27;
-	public static final int UndocumentedEmptyBlock = IrritantSet.GROUP0 | ASTNode.Bit28;
-	public static final int IndirectStaticAccess = IrritantSet.GROUP0 | ASTNode.Bit29;
-
-	// group 1
-	public static final int UnnecessaryElse  = IrritantSet.GROUP1 | ASTNode.Bit1;
-	public static final int UncheckedTypeOperation = IrritantSet.GROUP1 | ASTNode.Bit2;
-	public static final int FinalParameterBound = IrritantSet.GROUP1 | ASTNode.Bit3;
-	public static final int MissingSerialVersion = IrritantSet.GROUP1 | ASTNode.Bit4;
-	public static final int EnumUsedAsAnIdentifier = IrritantSet.GROUP1 | ASTNode.Bit5;
-	public static final int ForbiddenReference = IrritantSet.GROUP1 | ASTNode.Bit6;
-	public static final int VarargsArgumentNeedCast = IrritantSet.GROUP1 | ASTNode.Bit7;
-	public static final int NullReference = IrritantSet.GROUP1 | ASTNode.Bit8;
-	public static final int AutoBoxing = IrritantSet.GROUP1 | ASTNode.Bit9;
-	public static final int AnnotationSuperInterface = IrritantSet.GROUP1 | ASTNode.Bit10;
-	public static final int TypeHiding = IrritantSet.GROUP1 | ASTNode.Bit11;
-	public static final int MissingOverrideAnnotation = IrritantSet.GROUP1 | ASTNode.Bit12;
-	public static final int MissingEnumConstantCase = IrritantSet.GROUP1 | ASTNode.Bit13;
-	public static final int MissingDeprecatedAnnotation = IrritantSet.GROUP1 | ASTNode.Bit14;
-	public static final int DiscouragedReference = IrritantSet.GROUP1 | ASTNode.Bit15;
-	public static final int UnhandledWarningToken = IrritantSet.GROUP1 | ASTNode.Bit16;
-	public static final int RawTypeReference = IrritantSet.GROUP1 | ASTNode.Bit17;
-	public static final int UnusedLabel = IrritantSet.GROUP1 | ASTNode.Bit18;
-	public static final int ParameterAssignment = IrritantSet.GROUP1 | ASTNode.Bit19;
-	public static final int FallthroughCase = IrritantSet.GROUP1 | ASTNode.Bit20;
-	public static final int OverridingMethodWithoutSuperInvocation = IrritantSet.GROUP1 | ASTNode.Bit21;
-	public static final int PotentialNullReference = IrritantSet.GROUP1 | ASTNode.Bit22;
-	public static final int RedundantNullCheck = IrritantSet.GROUP1 | ASTNode.Bit23;
-	public static final int MissingJavadocTagDescription = IrritantSet.GROUP1 | ASTNode.Bit24;
-	public static final int UnusedTypeArguments = IrritantSet.GROUP1 | ASTNode.Bit25;
-	public static final int UnusedWarningToken = IrritantSet.GROUP1 | ASTNode.Bit26;
-	public static final int RedundantSuperinterface = IrritantSet.GROUP1 | ASTNode.Bit27;
-	public static final int ComparingIdentical = IrritantSet.GROUP1 | ASTNode.Bit28;
-	public static final int MissingSynchronizedModifierInInheritedMethod= IrritantSet.GROUP1 | ASTNode.Bit29;
-
-	// group 2
-	public static final int ShouldImplementHashcode = IrritantSet.GROUP2 | ASTNode.Bit1;
-	public static final int DeadCode = IrritantSet.GROUP2 | ASTNode.Bit2;
-	public static final int Tasks = IrritantSet.GROUP2 | ASTNode.Bit3;
-	public static final int UnusedObjectAllocation = IrritantSet.GROUP2 | ASTNode.Bit4;
-	public static final int MethodCanBeStatic = IrritantSet.GROUP2 | ASTNode.Bit5;
-	public static final int MethodCanBePotentiallyStatic = IrritantSet.GROUP2 | ASTNode.Bit6;
-	public static final int RedundantSpecificationOfTypeArguments = IrritantSet.GROUP2 | ASTNode.Bit7;
-	public static final int UnclosedCloseable = IrritantSet.GROUP2 | ASTNode.Bit8;
-	public static final int PotentiallyUnclosedCloseable = IrritantSet.GROUP2 | ASTNode.Bit9;
-	public static final int ExplicitlyClosedAutoCloseable = IrritantSet.GROUP2 | ASTNode.Bit10;
-	public static final int NullSpecViolation = IrritantSet.GROUP2 | ASTNode.Bit11;
-	public static final int NullAnnotationInferenceConflict = IrritantSet.GROUP2 | ASTNode.Bit12;
-	public static final int NullUncheckedConversion = IrritantSet.GROUP2 | ASTNode.Bit13;
-	public static final int RedundantNullAnnotation = IrritantSet.GROUP2 | ASTNode.Bit14;
-	public static final int MissingNonNullByDefaultAnnotation = IrritantSet.GROUP2 | ASTNode.Bit15;
-	public static final int MissingDefaultCase = IrritantSet.GROUP2 | ASTNode.Bit16;
-	public static final int UnusedTypeParameter = IrritantSet.GROUP2 | ASTNode.Bit17;
-	public static final int NonnullParameterAnnotationDropped = IrritantSet.GROUP2 | ASTNode.Bit18;
-	public static final int UnusedExceptionParameter = IrritantSet.GROUP2 | ASTNode.Bit19;
-	public static final int PessimisticNullAnalysisForFreeTypeVariables = IrritantSet.GROUP2 | ASTNode.Bit20;
-	public static final int NonNullTypeVariableFromLegacyInvocation = IrritantSet.GROUP2 | ASTNode.Bit21;
-	public static final int UnlikelyCollectionMethodArgumentType = IrritantSet.GROUP2 | ASTNode.Bit22;
-	public static final int UnlikelyEqualsArgumentType = IrritantSet.GROUP2 | ASTNode.Bit23;
-	public static final int UsingTerminallyDeprecatedAPI = IrritantSet.GROUP2 | ASTNode.Bit24;
-	public static final int APILeak = IrritantSet.GROUP2 | ASTNode.Bit25;
-	public static final int UnstableAutoModuleName = IrritantSet.GROUP2 | ASTNode.Bit26;
-	public static final int PreviewFeatureUsed = IrritantSet.GROUP2 | ASTNode.Bit27;
-	public static final int SuppressWarningsNotAnalysed = IrritantSet.GROUP2 | ASTNode.Bit28;
-	public static final int AnnotatedTypeArgumentToUnannotated = IrritantSet.GROUP2 | ASTNode.Bit29;
-
-
-//{ObjectTeams: OT/J specific problems/irritants:
-	public static final int OTJFlag = IrritantSet.GROUP3;
-	public static final int NotExactlyOneBasecall =    	   	 OTJFlag | ASTNode.Bit1;
-	public static final int UnsafeRoleInstantiation = 		 OTJFlag | ASTNode.Bit2;
-	public static final int FragileCallin = 				 OTJFlag | ASTNode.Bit3;
-	public static final int PotentialAmbiguousPlayedBy= 	 OTJFlag | ASTNode.Bit4;
-	public static final int AbstractPotentialRelevantRole =  OTJFlag | ASTNode.Bit5;
-	public static final int Decapsulation = 				 OTJFlag | ASTNode.Bit6;
-	public static final int DecapsulationWrite =			 OTJFlag | ASTNode.Bit7;
-	public static final int BindingConventions= 			 OTJFlag | ASTNode.Bit8;
-	public static final int AddingInferredCallout=			 OTJFlag | ASTNode.Bit9;
-	public static final int DeprecatedPathSyntax= 			 OTJFlag | ASTNode.Bit10;
-	public static final int WeaveIntoSystemClass=			 OTJFlag | ASTNode.Bit11;
-	public static final int DangerousCallin= 				 OTJFlag | ASTNode.Bit12;
-	public static final int OverridingFinalRole=             OTJFlag | ASTNode.Bit13;
-	public static final int ExceptionInGuard=				 OTJFlag | ASTNode.Bit14;
-	public static final int AmbiguousLowering=				 OTJFlag | ASTNode.Bit15;
-	public static final int AdaptingDeprecated=              OTJFlag | ASTNode.Bit16;
-	public static final int IgnoringRoleReturn=			     OTJFlag | ASTNode.Bit17;
-	public static final int BaseclassCycle=				     OTJFlag | ASTNode.Bit18;
-	public static final int EffectlessFieldaccess= 			 OTJFlag | ASTNode.Bit19;
-	public static final int UnusedParammap= 				 OTJFlag | ASTNode.Bit20;
-	public static final int HiddenLiftingProblem=      		 OTJFlag | ASTNode.Bit21;
-	public static final int OTREintoJava8=					 OTJFlag | ASTNode.Bit22;
-	public static final int EffectlessCallinBinding=		 OTJFlag | ASTNode.Bit23; // currently not configurable, but suppressable
-// SH}
-
-	// Severity level for handlers
-	/**
-	 * Defaults defined at {@link IrritantSet#COMPILER_DEFAULT_ERRORS}
-	 * @see #resetDefaults()
-	 */
-	protected IrritantSet errorThreshold;
-	/**
-	 * Defaults defined at {@link IrritantSet#COMPILER_DEFAULT_WARNINGS}
-	 * @see #resetDefaults()
-	 */
-	protected IrritantSet warningThreshold;
-	/**
-	 * Defaults defined at {@link IrritantSet#COMPILER_DEFAULT_INFOS}
-	 * @see #resetDefaults()
-	 */
-	protected IrritantSet infoThreshold;
-
-	/**
-	 * Default settings are to be defined in {@link CompilerOptions#resetDefaults()}
-	 */
-
-	/** Classfile debug information, may contain source file name, line numbers, local variable tables, etc... */
-	public int produceDebugAttributes;
-	/** Classfile method parameters information as per JEP 118... */
-	public boolean produceMethodParameters;
-	/** Indicates whether generic signature should be generated for lambda expressions */
-	public boolean generateGenericSignatureForLambdaExpressions;
-	/** Compliance level for the compiler, refers to a JDK version, e.g. {@link ClassFileConstants#JDK1_4} */
-	public long complianceLevel;
-	/** Original compliance level for the compiler, refers to a JDK version, e.g. {@link ClassFileConstants#JDK1_4},
-	 *  Usually same as the field complianceLevel, though the latter could deviate to create temporary sandbox
-	 *  modes during reconcile operations. See https://bugs.eclipse.org/bugs/show_bug.cgi?id=323633
-	 */
-	public long originalComplianceLevel;
-	/** Java source level, refers to a JDK version, e.g. {@link ClassFileConstants#JDK1_4} */
-	public long sourceLevel;
-	/** Original Java source level, refers to a JDK version, e.g. {@link ClassFileConstants#JDK1_4}
-	 *  Usually same as the field sourceLevel, though the latter could deviate to create temporary sandbox
-	 *  modes during reconcile operations. See https://bugs.eclipse.org/bugs/show_bug.cgi?id=323633
-	 * */
-	public long originalSourceLevel;
-	/** VM target level, refers to a JDK version, e.g. {@link ClassFileConstants#JDK1_4} */
-	public long targetJDK;
-	/** Source encoding format */
-	public String defaultEncoding;
-	/** Compiler trace verbosity */
-	public boolean verbose;
-	/** Indicates whether reference info is desired */
-	public boolean produceReferenceInfo;
-	/** Indicates if unused/optimizable local variables need to be preserved (debugging purpose) */
-	public boolean preserveAllLocalVariables;
-	/** Indicates whether literal expressions are inlined at parse-time or not */
-	public boolean parseLiteralExpressionsAsConstants;
-	/** Max problems per compilation unit */
-	public int maxProblemsPerUnit;
-	/** Tags used to recognize tasks in comments */
-	public char[][] taskTags;
-	/** Respective priorities of recognized task tags */
-	public char[][] taskPriorities;
-	/** Indicate whether tag detection is case sensitive or not */
-	public boolean isTaskCaseSensitive;
-	/** Specify whether deprecation inside deprecated code is to be reported */
-	public boolean reportDeprecationInsideDeprecatedCode;
-	/** Specify whether override of deprecated method is to be reported */
-	public boolean reportDeprecationWhenOverridingDeprecatedMethod;
-	/** Specify if should report unused parameter when implementing abstract method */
-	public boolean reportUnusedParameterWhenImplementingAbstract;
-	/** Specify if should report unused parameter when overriding concrete method */
-	public boolean reportUnusedParameterWhenOverridingConcrete;
-	/** Specify if should report documented unused parameter (in javadoc) */
-	public boolean reportUnusedParameterIncludeDocCommentReference;
-	/** Specify if should reported unused declared thrown exception when overriding method */
-	public boolean reportUnusedDeclaredThrownExceptionWhenOverriding;
-	/** Specify if should reported unused declared thrown exception when documented in javadoc */
-	public boolean reportUnusedDeclaredThrownExceptionIncludeDocCommentReference;
-	/** Specify if should reported unused declared thrown exception when Exception or Throwable */
-	public boolean reportUnusedDeclaredThrownExceptionExemptExceptionAndThrowable;
-	/** Specify whether should report constructor/setter method parameter hiding */
-	public boolean reportSpecialParameterHidingField;
-	/** Specify whether trivial deadcode pattern is to be reported (e.g. if (DEBUG) ...) */
-	public boolean reportDeadCodeInTrivialIfStatement;
-	/** Master flag controlling whether doc comment should be processed */
-	public boolean docCommentSupport;
-	/** Specify if invalid javadoc shall be reported */
-	public boolean reportInvalidJavadocTags;
-	/** Only report invalid javadoc above a given level of visibility of associated construct */
-	public int reportInvalidJavadocTagsVisibility;
-	/** Specify if deprecated javadoc ref is allowed */
-	public boolean reportInvalidJavadocTagsDeprecatedRef;
-	/** Specify if non visible javadoc ref is allowed */
-	public boolean reportInvalidJavadocTagsNotVisibleRef;
-	/** Specify when to report missing javadoc tag description */
-	public String reportMissingJavadocTagDescription;
-	/** Only report missing javadoc tags above a given level of visibility of associated construct */
-	public int reportMissingJavadocTagsVisibility;
-	/** Specify if need to flag missing javadoc tags for overriding method */
-	public boolean reportMissingJavadocTagsOverriding;
-	/** Specify if need to flag missing javadoc tags for method type parameters (java 1.5 and above)*/
-	public boolean reportMissingJavadocTagsMethodTypeParameters;
-	/** Only report missing javadoc comment above a given level of visibility of associated construct */
-	public int reportMissingJavadocCommentsVisibility;
-	/** Specify if need to flag missing javadoc comment for overriding method */
-	public boolean reportMissingJavadocCommentsOverriding;
-	/** Indicate whether the JSR bytecode should be inlined to avoid its presence in classfile */
-	public boolean inlineJsrBytecode;
-	/** Indicate whether common escaping finally blocks should be shared */
-	public boolean shareCommonFinallyBlocks;
-	/** Indicate if @SuppressWarning annotations are activated */
-	public boolean suppressWarnings;
-	/** Indicate if @SuppressWarning annotations should also suppress optional errors */
-	public boolean suppressOptionalErrors;
-	/** Specify if should treat optional error as fatal or just like warning */
-	public boolean treatOptionalErrorAsFatal;
-	/** Specify if parser should perform structural recovery in methods */
-	public boolean performMethodsFullRecovery;
-	/** Specify if parser perform statements recovery */
-	public boolean performStatementsRecovery;
-	/** Control whether annotation processing is enabled */
-	public boolean processAnnotations;
-	/** Store annotations */
-	public boolean storeAnnotations;
-	/** Specify if need to report missing override annotation for a method implementing an interface method (java 1.6 and above)*/
-	public boolean reportMissingOverrideAnnotationForInterfaceMethodImplementation;
-	/** Indicate if annotation processing generates classfiles */
-	public boolean generateClassFiles;
-	/** Indicate if method bodies should be ignored */
-	public boolean ignoreMethodBodies;
-	/** Raise null related warnings for variables tainted inside an assert statement (java 1.4 and above)*/
-	public boolean includeNullInfoFromAsserts;
-	/** Controls whether forced generic type problems get reported  */
-	public boolean reportUnavoidableGenericTypeProblems;
-	/** Indicates that the 'ignore optional problems from source folder' option need to be ignored
-	 *  See https://bugs.eclipse.org/bugs/show_bug.cgi?id=372377
-	 */
-	public boolean ignoreSourceFolderWarningOption;
-
-//{ObjectTeams: other configurable options of OT/J:
-	// verbosity of reporting decapsulation:
-	public String decapsulation = REPORT_BINDING;
-	// are OT-keywords allowed as identifiers in non-OT-code?
-	public boolean allowScopedKeywords = true;
-	// even stronger: forcing the scanner to pure Java?
-	public boolean isPureJava = false;
-	// which scheme should be used for code generation (esp. callin bindings)?
-	public WeavingScheme weavingScheme = WeavingScheme.OTRE;
-// SH}
-
-	// === Support for Null Annotations: ===
-	/** Master switch for null analysis based on annotations: */
-	public boolean isAnnotationBasedNullAnalysisEnabled;
-	/** Fully qualified name of annotation to use as marker for nullable types. */
-	public char[][] nullableAnnotationName;
-	/** Fully qualified name of annotation to use as marker for nonnull types. */
-	public char[][] nonNullAnnotationName;
-	/** Fully qualified name of annotation to use as marker for default nonnull. */
-	public char[][] nonNullByDefaultAnnotationName;
-	/** Fully qualified names of secondary annotations to use as marker for nullable types. */
-	public String[] nullableAnnotationSecondaryNames = NO_STRINGS;
-	/** Fully qualified names of secondary annotations to use as marker for nonnull types. */
-	public String[] nonNullAnnotationSecondaryNames = NO_STRINGS;
-	/** Fully qualified names of secondary annotations to use as marker for default nonnull. */
-	public String[] nonNullByDefaultAnnotationSecondaryNames = NO_STRINGS;
-	/** TagBits-encoded default for non-annotated types. */
-	public long intendedDefaultNonNullness; // 0 or TagBits#AnnotationNonNull
-	/** Should resources (objects of type Closeable) be analysed for matching calls to close()? */
-	public boolean analyseResourceLeaks;
-	/** Should missing enum cases be reported even if a default case exists in the same switch? */
-	public boolean reportMissingEnumCaseDespiteDefault;
-
-	/** When checking for unlikely argument types of of Map.get() et al, perform strict analysis against the expected type */
-	public boolean reportUnlikelyCollectionMethodArgumentTypeStrict;
-
-	/** Should the compiler tolerate illegal ambiguous varargs invocation in compliance < 1.7
-	 * to be bug compatible with javac? (bug 383780) */
-	public static boolean tolerateIllegalAmbiguousVarargsInvocation;
-	{
-		String tolerateIllegalAmbiguousVarargs = System.getProperty("tolerateIllegalAmbiguousVarargsInvocation"); //$NON-NLS-1$
-		tolerateIllegalAmbiguousVarargsInvocation = tolerateIllegalAmbiguousVarargs != null && tolerateIllegalAmbiguousVarargs.equalsIgnoreCase("true"); //$NON-NLS-1$
-	}
-	/** Should null annotations of overridden methods be inherited? */
-	public boolean inheritNullAnnotations;
-
-	/** Should immediate null-check for fields be considered during null analysis (syntactical match)? */
-	public boolean enableSyntacticNullAnalysisForFields;
-
-	/** Is the error level for pessimistic null analysis for free type variables different from "ignore"? */
-	public boolean pessimisticNullAnalysisForFreeTypeVariablesEnabled;
-
-	public boolean complainOnUninternedIdentityComparison;
-	public boolean emulateJavacBug8031744 = true;
-
-	/** Not directly configurable, derived from other options by LookupEnvironment.usesNullTypeAnnotations() */
-	public Boolean useNullTypeAnnotations = null;
-
-	/** Master flag to enabled/disable all preview features */
-	public boolean enablePreviewFeatures;
-
-	/** Enable a less restrictive compile mode for JDT debug. */
-	public boolean enableJdtDebugCompileMode;
-
-	/** Should the compiler ignore the unnamed module when a package is defined in both a named module and the unnamed module? */
-	public boolean ignoreUnnamedModuleForSplitPackage;
-
-	// keep in sync with warningTokenToIrritant and warningTokenFromIrritant
-	public final static String[] warningTokens = {
-		"all", //$NON-NLS-1$
-		"boxing", //$NON-NLS-1$
-		"cast", //$NON-NLS-1$
-		"dep-ann", //$NON-NLS-1$
-		"deprecation", //$NON-NLS-1$
-		"exports",  //$NON-NLS-1$
-		"fallthrough", //$NON-NLS-1$
-		"finally", //$NON-NLS-1$
-		"hiding", //$NON-NLS-1$
-		"incomplete-switch", //$NON-NLS-1$
-		"javadoc", //$NON-NLS-1$
-		"module", //$NON-NLS-1$
-		"nls", //$NON-NLS-1$
-		"null", //$NON-NLS-1$
-		"rawtypes", //$NON-NLS-1$
-		"removal", //$NON-NLS-1$
-		"resource", //$NON-NLS-1$
-		"restriction", //$NON-NLS-1$
-		"serial", //$NON-NLS-1$
-		"static-access", //$NON-NLS-1$
-		"static-method", //$NON-NLS-1$
-		"super", //$NON-NLS-1$
-		"synthetic-access", //$NON-NLS-1$
-		"sync-override",	//$NON-NLS-1$
-		"unchecked", //$NON-NLS-1$
-		"unlikely-arg-type", //$NON-NLS-1$
-		"unqualified-field-access", //$NON-NLS-1$
-		"unused", //$NON-NLS-1$
-		"preview", //$NON-NLS-1$
-//{ObjectTeams:
-		"basecall",             //$NON-NLS-1$
-		"baseclasscycle",       //$NON-NLS-1$
-		"roleinstantiation",    //$NON-NLS-1$
-		"fragilecallin",        //$NON-NLS-1$
-		"ambiguousbinding",     //$NON-NLS-1$
-		"abstractrelevantrole", //$NON-NLS-1$
-		"hidden-lifting-problem",//$NON-NLS-1$
-		"decapsulation",        //$NON-NLS-1$
-		"bindingconventions",   //$NON-NLS-1$
-		"roletypesyntax",       //$NON-NLS-1$
-		"inferredcallout",      //$NON-NLS-1$
-		"bindingtosystemclass", //$NON-NLS-1$
-		"dangerouscallin",      //$NON-NLS-1$
-		"overridefinalrole",    //$NON-NLS-1$
-		"exceptioninguard",     //$NON-NLS-1$
-		"ambiguouslowering",	//$NON-NLS-1$
-		"adapt-deprecated", 	//$NON-NLS-1$
-		"ignoredresult", 		//$NON-NLS-1$
-// SH}
-	};
-
-	/**
-	 * Initializing the compiler options with defaults
-	 */
-	public CompilerOptions(){
-		this(null); // use default options
-	}
-
-	/**
-	 * Initializing the compiler options with external settings
-	 * @param settings
-	 */
-	public CompilerOptions(Map<String, String> settings){
-		resetDefaults();
-		if (settings != null) {
-			set(settings);
-		}
-	}
-
-	/**
-	 * @deprecated used to preserve 3.1 and 3.2M4 compatibility of some Compiler constructors
-	 */
-	public CompilerOptions(Map settings, boolean parseLiteralExpressionsAsConstants){
-		this(settings);
-		this.parseLiteralExpressionsAsConstants = parseLiteralExpressionsAsConstants;
-	}
-
-	/**
-	 * Return the latest Java language version supported by the Eclipse compiler
-	 */
-	public static String getLatestVersion() {
-		return VERSION_19;
-	}
-	/**
-	 * Return the most specific option key controlling this irritant. Note that in some case, some irritant is controlled by
-	 * other master options (e.g. javadoc, deprecation, etc.).
-	 * This information is intended for grouping purpose (several problems governed by a rule)
-	 */
-	public static String optionKeyFromIrritant(int irritant) {
-		// keep in sync with warningTokens and warningTokenToIrritant
-		switch (irritant) {
-			case MethodWithConstructorName :
-				return OPTION_ReportMethodWithConstructorName;
-			case OverriddenPackageDefaultMethod  :
-				return OPTION_ReportOverridingPackageDefaultMethod;
-			case UsingDeprecatedAPI :
-			case (InvalidJavadoc | UsingDeprecatedAPI) :
-				return OPTION_ReportDeprecation;
-			case UsingTerminallyDeprecatedAPI :
-			case (InvalidJavadoc | UsingTerminallyDeprecatedAPI) :
-				return OPTION_ReportTerminalDeprecation;
-			case MaskedCatchBlock  :
-				return OPTION_ReportHiddenCatchBlock;
-			case UnusedLocalVariable :
-				return OPTION_ReportUnusedLocal;
-			case UnusedArgument :
-				return OPTION_ReportUnusedParameter;
-			case UnusedExceptionParameter :
-				return OPTION_ReportUnusedExceptionParameter;
-			case NoImplicitStringConversion :
-				return OPTION_ReportNoImplicitStringConversion;
-			case AccessEmulation :
-				return OPTION_ReportSyntheticAccessEmulation;
-			case NonExternalizedString :
-				return OPTION_ReportNonExternalizedStringLiteral;
-			case AssertUsedAsAnIdentifier :
-				return OPTION_ReportAssertIdentifier;
-			case UnusedImport :
-				return OPTION_ReportUnusedImport;
-			case NonStaticAccessToStatic :
-				return OPTION_ReportNonStaticAccessToStatic;
-			case Task :
-				return OPTION_TaskTags;
-			case NoEffectAssignment :
-				return OPTION_ReportNoEffectAssignment;
-			case IncompatibleNonInheritedInterfaceMethod :
-				return OPTION_ReportIncompatibleNonInheritedInterfaceMethod;
-			case UnusedPrivateMember :
-				return OPTION_ReportUnusedPrivateMember;
-			case LocalVariableHiding :
-				return OPTION_ReportLocalVariableHiding;
-			case FieldHiding :
-				return OPTION_ReportFieldHiding;
-			case AccidentalBooleanAssign :
-				return OPTION_ReportPossibleAccidentalBooleanAssignment;
-			case EmptyStatement :
-				return OPTION_ReportEmptyStatement;
-			case MissingJavadocComments  :
-				return OPTION_ReportMissingJavadocComments;
-			case MissingJavadocTags :
-				return OPTION_ReportMissingJavadocTags;
-			case UnqualifiedFieldAccess :
-				return OPTION_ReportUnqualifiedFieldAccess;
-			case UnusedDeclaredThrownException :
-				return OPTION_ReportUnusedDeclaredThrownException;
-			case FinallyBlockNotCompleting :
-				return OPTION_ReportFinallyBlockNotCompletingNormally;
-			case InvalidJavadoc :
-				return OPTION_ReportInvalidJavadoc;
-			case UnnecessaryTypeCheck :
-				return OPTION_ReportUnnecessaryTypeCheck;
-			case UndocumentedEmptyBlock :
-				return OPTION_ReportUndocumentedEmptyBlock;
-			case IndirectStaticAccess :
-				return OPTION_ReportIndirectStaticAccess;
-			case UnnecessaryElse  :
-				return OPTION_ReportUnnecessaryElse;
-			case UncheckedTypeOperation :
-				return OPTION_ReportUncheckedTypeOperation;
-			case FinalParameterBound :
-				return OPTION_ReportFinalParameterBound;
-			case MissingSerialVersion :
-				return OPTION_ReportMissingSerialVersion ;
-			case EnumUsedAsAnIdentifier :
-				return OPTION_ReportEnumIdentifier;
-			case ForbiddenReference :
-				return OPTION_ReportForbiddenReference;
-			case VarargsArgumentNeedCast :
-				return OPTION_ReportVarargsArgumentNeedCast;
-			case NullReference :
-				return OPTION_ReportNullReference;
-			case PotentialNullReference :
-				return OPTION_ReportPotentialNullReference;
-			case RedundantNullCheck :
-				return OPTION_ReportRedundantNullCheck;
-			case AutoBoxing :
-				return OPTION_ReportAutoboxing;
-			case AnnotationSuperInterface :
-				return OPTION_ReportAnnotationSuperInterface;
-			case TypeHiding :
-				return OPTION_ReportTypeParameterHiding;
-			case MissingOverrideAnnotation :
-				return OPTION_ReportMissingOverrideAnnotation;
-			case MissingEnumConstantCase :
-				return OPTION_ReportIncompleteEnumSwitch;
-			case MissingDefaultCase :
-				return OPTION_ReportMissingDefaultCase;
-			case MissingDeprecatedAnnotation :
-				return OPTION_ReportMissingDeprecatedAnnotation;
-			case DiscouragedReference :
-				return OPTION_ReportDiscouragedReference;
-			case UnhandledWarningToken :
-				return OPTION_ReportUnhandledWarningToken;
-			case RawTypeReference :
-				return OPTION_ReportRawTypeReference;
-			case UnusedLabel :
-				return OPTION_ReportUnusedLabel;
-			case ParameterAssignment :
-				return OPTION_ReportParameterAssignment;
-			case FallthroughCase :
-				return OPTION_ReportFallthroughCase;
-			case OverridingMethodWithoutSuperInvocation :
-				return OPTION_ReportOverridingMethodWithoutSuperInvocation;
-			case MissingJavadocTagDescription :
-				return OPTION_ReportMissingJavadocTagDescription;
-			case UnusedTypeArguments :
-				return OPTION_ReportUnusedTypeArgumentsForMethodInvocation;
-			case UnusedTypeParameter:
-				return OPTION_ReportUnusedTypeParameter;
-			case UnusedWarningToken :
-				return OPTION_ReportUnusedWarningToken;
-			case RedundantSuperinterface :
-				return OPTION_ReportRedundantSuperinterface;
-			case ComparingIdentical :
-				return OPTION_ReportComparingIdentical;
-			case MissingSynchronizedModifierInInheritedMethod :
-				return OPTION_ReportMissingSynchronizedOnInheritedMethod;
-			case ShouldImplementHashcode :
-				return OPTION_ReportMissingHashCodeMethod;
-			case DeadCode :
-				return OPTION_ReportDeadCode;
-			case UnusedObjectAllocation:
-				return OPTION_ReportUnusedObjectAllocation;
-			case MethodCanBeStatic :
-				return OPTION_ReportMethodCanBeStatic;
-			case MethodCanBePotentiallyStatic :
-				return OPTION_ReportMethodCanBePotentiallyStatic;
-			case MissingNonNullByDefaultAnnotation :
-				return OPTION_ReportMissingNonNullByDefaultAnnotation;
-			case RedundantSpecificationOfTypeArguments :
-				return OPTION_ReportRedundantSpecificationOfTypeArguments;
-			case UnclosedCloseable :
-				return OPTION_ReportUnclosedCloseable;
-			case PotentiallyUnclosedCloseable :
-				return OPTION_ReportPotentiallyUnclosedCloseable;
-			case ExplicitlyClosedAutoCloseable :
-				return OPTION_ReportExplicitlyClosedAutoCloseable;
-//{ObjectTeams:
-			case NotExactlyOneBasecall :
-				return OPTION_ReportNotExactlyOneBasecall;
-			case BaseclassCycle:
-				return OPTION_ReportBaseclassCycle;
-			case UnsafeRoleInstantiation :
-				return OPTION_ReportUnsafeRoleInstantiation;
-			case EffectlessFieldaccess :
-				return OPTION_ReportEffectlessFieldaccess;
-			case FragileCallin :
-				return OPTION_ReportFragileCallin;
-			case UnusedParammap :
-				return OPTION_ReportUnusedParammap;
-			case PotentialAmbiguousPlayedBy :
-				return OPTION_ReportPotentialAmbiguousPlayedby;
-			case AbstractPotentialRelevantRole :
-				return OPTION_ReportAbstractPotentialRelevantRole;
-			case HiddenLiftingProblem :
-				return OPTION_ReportHiddenLiftingProblem;
-			case Decapsulation :
-				return OPTION_ReportDecapsulation;
-			case DecapsulationWrite :
-				return OPTION_ReportDecapsulationWrite;
-			case BindingConventions :
-				return OPTION_ReportBindingConventions;
-			case AddingInferredCallout :
-				return OPTION_ReportInferredCallout;
-			case DeprecatedPathSyntax :
-				return OPTION_ReportDeprecatedPathSyntax;
-			case WeaveIntoSystemClass :
-				return OPTION_ReportWeaveIntoSystemClass;
-			/* not (yet?) configurable:
-			case DangerousCallin :
-				return OPTION_ReportDangerousCallin;
-			*/
-			case OverridingFinalRole :
-				return OPTION_ReportOverrideFinalRole;
-			case ExceptionInGuard :
-				return OPTION_ReportExceptionInGuard;
-			case AmbiguousLowering:
-				return OPTION_ReportAmbiguousLowering;
-			case AdaptingDeprecated:
-				return OPTION_ReportAdaptingDeprecated;
-			case IgnoringRoleReturn:
-				return OPTION_ReportIgnoringRoleMethodReturn;
-			case OTREintoJava8:
-				return OPTION_ReportOtreWeavingIntoJava8;
-// SH}
-			case NullSpecViolation :
-				return OPTION_ReportNullSpecViolation;
-			case NullAnnotationInferenceConflict :
-				return OPTION_ReportNullAnnotationInferenceConflict;
-			case NullUncheckedConversion :
-				return OPTION_ReportNullUncheckedConversion;
-			case RedundantNullAnnotation :
-				return OPTION_ReportRedundantNullAnnotation;
-			case NonnullParameterAnnotationDropped:
-				return OPTION_ReportNonnullParameterAnnotationDropped;
-			case PessimisticNullAnalysisForFreeTypeVariables:
-				return OPTION_PessimisticNullAnalysisForFreeTypeVariables;
-			case NonNullTypeVariableFromLegacyInvocation:
-				return OPTION_ReportNonNullTypeVariableFromLegacyInvocation;
-			case AnnotatedTypeArgumentToUnannotated:
-				return OPTION_ReportAnnotatedTypeArgumentToUnannotated;
-			case UnlikelyCollectionMethodArgumentType:
-				return OPTION_ReportUnlikelyCollectionMethodArgumentType;
-			case UnlikelyEqualsArgumentType:
-				return OPTION_ReportUnlikelyEqualsArgumentType;
-			case APILeak:
-				return OPTION_ReportAPILeak;
-			case UnstableAutoModuleName:
-				return OPTION_ReportUnstableAutoModuleName;
-			case PreviewFeatureUsed:
-				return OPTION_ReportPreviewFeatures;
-			case SuppressWarningsNotAnalysed:
-				return OPTION_ReportSuppressWarningNotFullyAnalysed;
-		}
-		return null;
-	}
-
-	public static String versionFromJdkLevel(long jdkLevel) {
-		int major = (int)(jdkLevel>>16);
-		switch (major) {
-			case ClassFileConstants.MAJOR_VERSION_1_1 :
-				if (jdkLevel == ClassFileConstants.JDK1_1)
-					return VERSION_1_1;
-				break;
-			case ClassFileConstants.MAJOR_VERSION_1_2 :
-				if (jdkLevel == ClassFileConstants.JDK1_2)
-					return VERSION_1_2;
-				break;
-			case ClassFileConstants.MAJOR_VERSION_1_3 :
-				if (jdkLevel == ClassFileConstants.JDK1_3)
-					return VERSION_1_3;
-				break;
-			case ClassFileConstants.MAJOR_VERSION_1_4 :
-				if (jdkLevel == ClassFileConstants.JDK1_4)
-					return VERSION_1_4;
-				break;
-			case ClassFileConstants.MAJOR_VERSION_1_5 :
-				if (jdkLevel == ClassFileConstants.JDK1_5)
-					return VERSION_1_5;
-				break;
-			case ClassFileConstants.MAJOR_VERSION_1_6 :
-				if (jdkLevel == ClassFileConstants.JDK1_6)
-					return VERSION_1_6;
-				break;
-			case ClassFileConstants.MAJOR_VERSION_1_7 :
-				if (jdkLevel == ClassFileConstants.JDK1_7)
-					return VERSION_1_7;
-				break;
-			case ClassFileConstants.MAJOR_VERSION_1_8 :
-				if (jdkLevel == ClassFileConstants.JDK1_8)
-					return VERSION_1_8;
-				break;
-			case ClassFileConstants.MAJOR_VERSION_9 :
-				if (jdkLevel == ClassFileConstants.JDK9)
-					return VERSION_9;
-				break;
-			case ClassFileConstants.MAJOR_VERSION_10 :
-				if (jdkLevel == ClassFileConstants.JDK10)
-					return VERSION_10;
-				break;
-			default:
-				if(major > ClassFileConstants.MAJOR_VERSION_10) {
-					return "" + (major - ClassFileConstants.MAJOR_VERSION_0); //$NON-NLS-1$
-				}
-				return  Util.EMPTY_STRING; // unknown version
-
-		}
-		return Util.EMPTY_STRING; // unknown version
-	}
-
-	public static long releaseToJDKLevel(String release) {
-		if (release != null && release.length() > 0) {
-			int major = Integer.parseInt(release) + ClassFileConstants.MAJOR_VERSION_0;
-			if (major <= ClassFileConstants.MAJOR_LATEST_VERSION) {
-				long jdkLevel = ((long) major << 16) + ClassFileConstants.MINOR_VERSION_0;
-				return jdkLevel;
-			}
-		}
-		return 0;
-	}
-	public static long versionToJdkLevel(String versionID) {
-		return versionToJdkLevel(versionID, true);
-	}
-	public static long versionToJdkLevel(String versionID, boolean supportUnreleased) {
-		String version = versionID;
-		// verification is optimized for all versions with same length and same "1." prefix
-		if (version != null && version.length() > 0) {
-			if (version.length() >= 3 && version.charAt(0) == '1' && version.charAt(1) == '.') {
-				switch (version.charAt(2)) {
-					case '1':
-						return ClassFileConstants.JDK1_1;
-					case '2':
-						return ClassFileConstants.JDK1_2;
-					case '3':
-						return ClassFileConstants.JDK1_3;
-					case '4':
-						return ClassFileConstants.JDK1_4;
-					case '5':
-						return ClassFileConstants.JDK1_5;
-					case '6':
-						return ClassFileConstants.JDK1_6;
-					case '7':
-						return ClassFileConstants.JDK1_7;
-					case '8':
-						return ClassFileConstants.JDK1_8;
-					default:
-						return 0; // unknown
-				}
-			} else {
-				try {
-					int index = version.indexOf('.');
-					if (index != -1) {
-						version = version.substring(0, index);
-					} else {
-						index = version.indexOf('-');
-						if (index != -1)
-							version = version.substring(0, index);
-					}
-					int major = Integer.parseInt(version) + ClassFileConstants.MAJOR_VERSION_0;
-					if (major > ClassFileConstants.MAJOR_LATEST_VERSION) {
-						if (supportUnreleased)
-							major = ClassFileConstants.MAJOR_LATEST_VERSION;
-						else
-							return 0; // unknown
-					}
-					return ((long) major << 16) + ClassFileConstants.MINOR_VERSION_0;
-				} catch (NumberFormatException e) {
-					// do nothing and return 0 at the end
-				}
-			}
-		}
-		if (VERSION_JSR14.equals(versionID)) {
-			return ClassFileConstants.JDK1_4;
-		}
-		if (VERSION_CLDC1_1.equals(versionID)) {
-			return ClassFileConstants.CLDC_1_1;
-		}
-		return 0; // unknown
-	}
-
-	/**
-	 * Return all warning option names for use as keys in compiler options maps.
-	 * @return all warning option names
-	 */
-	public static String[] warningOptionNames() {
-		String[] result = {
-			OPTION_ReportAnnotationSuperInterface,
-			OPTION_ReportAssertIdentifier,
-			OPTION_ReportAutoboxing,
-			OPTION_ReportComparingIdentical,
-			OPTION_ReportDeadCode,
-			OPTION_ReportDeadCodeInTrivialIfStatement,
-			OPTION_ReportDeprecation,
-			OPTION_ReportDeprecationInDeprecatedCode,
-			OPTION_ReportDeprecationWhenOverridingDeprecatedMethod,
-			OPTION_ReportDiscouragedReference,
-			OPTION_ReportEmptyStatement,
-			OPTION_ReportEnumIdentifier,
-			OPTION_ReportFallthroughCase,
-			OPTION_ReportFieldHiding,
-			OPTION_ReportFinallyBlockNotCompletingNormally,
-			OPTION_ReportFinalParameterBound,
-			OPTION_ReportForbiddenReference,
-			OPTION_ReportHiddenCatchBlock,
-			OPTION_ReportIncompatibleNonInheritedInterfaceMethod,
-			OPTION_ReportMissingDefaultCase,
-			OPTION_ReportIncompleteEnumSwitch,
-			OPTION_ReportMissingEnumCaseDespiteDefault,
-			OPTION_ReportIndirectStaticAccess,
-			OPTION_ReportInvalidJavadoc,
-			OPTION_ReportInvalidJavadocTags,
-			OPTION_ReportInvalidJavadocTagsDeprecatedRef,
-			OPTION_ReportInvalidJavadocTagsNotVisibleRef,
-			OPTION_ReportInvalidJavadocTagsVisibility,
-			OPTION_ReportLocalVariableHiding,
-			OPTION_ReportMethodCanBePotentiallyStatic,
-			OPTION_ReportMethodCanBeStatic,
-			OPTION_ReportMethodWithConstructorName,
-			OPTION_ReportMissingDeprecatedAnnotation,
-			OPTION_ReportMissingHashCodeMethod,
-			OPTION_ReportMissingJavadocComments,
-			OPTION_ReportMissingJavadocCommentsOverriding,
-			OPTION_ReportMissingJavadocCommentsVisibility,
-			OPTION_ReportMissingJavadocTagDescription,
-			OPTION_ReportMissingJavadocTags,
-			OPTION_ReportMissingJavadocTagsMethodTypeParameters,
-			OPTION_ReportMissingJavadocTagsOverriding,
-			OPTION_ReportMissingJavadocTagsVisibility,
-			OPTION_ReportMissingOverrideAnnotation,
-			OPTION_ReportMissingOverrideAnnotationForInterfaceMethodImplementation,
-			OPTION_ReportMissingSerialVersion,
-			OPTION_ReportMissingSynchronizedOnInheritedMethod,
-			OPTION_ReportNoEffectAssignment,
-			OPTION_ReportNoImplicitStringConversion,
-			OPTION_ReportNonExternalizedStringLiteral,
-			OPTION_ReportNonStaticAccessToStatic,
-			OPTION_ReportNullReference,
-			OPTION_ReportOverridingMethodWithoutSuperInvocation,
-			OPTION_ReportOverridingPackageDefaultMethod,
-			OPTION_ReportParameterAssignment,
-			OPTION_ReportPossibleAccidentalBooleanAssignment,
-			OPTION_ReportPotentialNullReference,
-			OPTION_ReportRawTypeReference,
-			OPTION_ReportRedundantNullCheck,
-			OPTION_ReportRedundantSuperinterface,
-			OPTION_ReportRedundantSpecificationOfTypeArguments,
-			OPTION_ReportSpecialParameterHidingField,
-			OPTION_ReportSyntheticAccessEmulation,
-			OPTION_ReportTasks,
-			OPTION_ReportTypeParameterHiding,
-			OPTION_ReportUnavoidableGenericTypeProblems,
-			OPTION_ReportUncheckedTypeOperation,
-			OPTION_ReportUndocumentedEmptyBlock,
-			OPTION_ReportUnhandledWarningToken,
-			OPTION_ReportUnnecessaryElse,
-			OPTION_ReportUnnecessaryTypeCheck,
-			OPTION_ReportUnqualifiedFieldAccess,
-			OPTION_ReportUnusedDeclaredThrownException,
-			OPTION_ReportUnusedDeclaredThrownExceptionExemptExceptionAndThrowable,
-			OPTION_ReportUnusedDeclaredThrownExceptionIncludeDocCommentReference,
-			OPTION_ReportUnusedDeclaredThrownExceptionWhenOverriding,
-			OPTION_ReportUnusedImport,
-			OPTION_ReportUnusedLabel,
-			OPTION_ReportUnusedLocal,
-			OPTION_ReportUnusedObjectAllocation,
-			OPTION_ReportUnusedParameter,
-			OPTION_ReportUnusedExceptionParameter,
-			OPTION_ReportUnusedParameterIncludeDocCommentReference,
-			OPTION_ReportUnusedParameterWhenImplementingAbstract,
-			OPTION_ReportUnusedParameterWhenOverridingConcrete,
-			OPTION_ReportUnusedPrivateMember,
-			OPTION_ReportUnusedTypeArgumentsForMethodInvocation,
-			OPTION_ReportUnusedWarningToken,
-			OPTION_ReportVarargsArgumentNeedCast,
-			OPTION_ReportUnclosedCloseable,
-			OPTION_ReportPotentiallyUnclosedCloseable,
-			OPTION_ReportExplicitlyClosedAutoCloseable,
-//{ObjectTeams:
-			OPTION_ReportNotExactlyOneBasecall,
-			OPTION_ReportBaseclassCycle,
-			OPTION_ReportUnsafeRoleInstantiation,
-			OPTION_ReportEffectlessFieldaccess,
-			OPTION_ReportFragileCallin,
-			OPTION_ReportUnusedParammap,
-			OPTION_ReportPotentialAmbiguousPlayedby,
-			OPTION_ReportAbstractPotentialRelevantRole,
-			OPTION_ReportHiddenLiftingProblem,
-			OPTION_ReportDecapsulation,
-			OPTION_ReportDecapsulationWrite,
-			OPTION_ReportDeprecatedPathSyntax,
-			OPTION_ReportBindingConventions,
-			OPTION_ReportInferredCallout,
-			OPTION_ReportWeaveIntoSystemClass,
-			OPTION_ReportOverrideFinalRole,
-			OPTION_ReportExceptionInGuard,
-			OPTION_ReportAmbiguousLowering,
-			OPTION_ReportAdaptingDeprecated,
-			OPTION_ReportIgnoringRoleMethodReturn,
-			OPTION_ReportOtreWeavingIntoJava8,
-			OPTION_AllowScopedKeywords,
-// SH}
-			OPTION_AnnotationBasedNullAnalysis,
-			OPTION_NonNullAnnotationName,
-			OPTION_NullableAnnotationName,
-			OPTION_NonNullByDefaultAnnotationName,
-			OPTION_ReportMissingNonNullByDefaultAnnotation,
-			OPTION_ReportNullSpecViolation,
-			OPTION_ReportNullAnnotationInferenceConflict,
-			OPTION_ReportNullUncheckedConversion,
-			OPTION_ReportRedundantNullAnnotation,
-			OPTION_SyntacticNullAnalysisForFields,
-			OPTION_ReportUnusedTypeParameter,
-			OPTION_InheritNullAnnotations,
-			OPTION_ReportNonnullParameterAnnotationDropped,
-			OPTION_ReportAnnotatedTypeArgumentToUnannotated,
-			OPTION_ReportUnlikelyCollectionMethodArgumentType,
-			OPTION_ReportUnlikelyEqualsArgumentType,
-			OPTION_ReportAPILeak,
-			OPTION_ReportPreviewFeatures,
-			OPTION_ReportSuppressWarningNotFullyAnalysed
-		};
-		return result;
-	}
-
-	/**
-	 * For suppressable warnings
-	 */
-	public static String warningTokenFromIrritant(int irritant) {
-		// keep in sync with warningTokens and warningTokenToIrritant
-		switch (irritant) {
-			case (InvalidJavadoc | UsingDeprecatedAPI) :
-			case UsingDeprecatedAPI :
-				return "deprecation"; //$NON-NLS-1$
-			case (InvalidJavadoc | UsingTerminallyDeprecatedAPI) :
-			case UsingTerminallyDeprecatedAPI :
-				return "removal"; //$NON-NLS-1$
-			case FinallyBlockNotCompleting :
-				return "finally"; //$NON-NLS-1$
-			case FieldHiding :
-			case LocalVariableHiding :
-			case MaskedCatchBlock :
-				return "hiding"; //$NON-NLS-1$
-			case NonExternalizedString :
-				return "nls"; //$NON-NLS-1$
-			case UnnecessaryTypeCheck :
-				return "cast"; //$NON-NLS-1$
-			case IndirectStaticAccess :
-			case NonStaticAccessToStatic :
-				return "static-access"; //$NON-NLS-1$
-			case AccessEmulation :
-				return "synthetic-access"; //$NON-NLS-1$
-			case UnqualifiedFieldAccess :
-				return "unqualified-field-access"; //$NON-NLS-1$
-			case UncheckedTypeOperation :
-				return "unchecked"; //$NON-NLS-1$
-			case MissingSerialVersion :
-				return "serial"; //$NON-NLS-1$
-			case AutoBoxing :
-				return "boxing"; //$NON-NLS-1$
-			case TypeHiding :
-				return "hiding"; //$NON-NLS-1$
-			case MissingEnumConstantCase :
-			case MissingDefaultCase :
-				return "incomplete-switch"; //$NON-NLS-1$
-			case MissingDeprecatedAnnotation :
-				return "dep-ann"; //$NON-NLS-1$
-			case RawTypeReference :
-				return "rawtypes"; //$NON-NLS-1$
-			case DeadCode :
-			case RedundantSuperinterface :
-			case RedundantSpecificationOfTypeArguments :
-			case UnusedDeclaredThrownException :
-			case UnusedExceptionParameter :
-			case UnusedImport :
-			case UnusedLabel :
-			case UnusedLocalVariable :
-			case UnusedObjectAllocation :
-			case UnusedArgument : 		// OPTION_ReportUnusedParameter
-			case UnusedPrivateMember :
-			case UnusedTypeArguments : 	// OPTION_ReportUnusedTypeArgumentsForMethodInvocation
-			case UnusedTypeParameter:
-				return "unused"; //$NON-NLS-1$
-			case DiscouragedReference :
-			case ForbiddenReference :
-				return "restriction"; //$NON-NLS-1$
-			case NullReference :
-			case PotentialNullReference :
-			case RedundantNullCheck :
-			case NullSpecViolation :
-			case NullAnnotationInferenceConflict :
-			case NullUncheckedConversion :
-			case RedundantNullAnnotation :
-			case MissingNonNullByDefaultAnnotation:
-			case NonnullParameterAnnotationDropped:
-			case PessimisticNullAnalysisForFreeTypeVariables:
-			case NonNullTypeVariableFromLegacyInvocation:
-			case AnnotatedTypeArgumentToUnannotated:
-				return "null"; //$NON-NLS-1$
-			case FallthroughCase :
-				return "fallthrough"; //$NON-NLS-1$
-			case OverridingMethodWithoutSuperInvocation :
-				return "super"; //$NON-NLS-1$
-			case MethodCanBeStatic :
-			case MethodCanBePotentiallyStatic :
-				return "static-method"; //$NON-NLS-1$
-			case PotentiallyUnclosedCloseable:
-			case UnclosedCloseable:
-			case ExplicitlyClosedAutoCloseable:
-				return "resource"; //$NON-NLS-1$
-			case InvalidJavadoc :
-			case MissingJavadocComments :
-			case MissingJavadocTags:
-				return "javadoc"; //$NON-NLS-1$
-			case MissingSynchronizedModifierInInheritedMethod:
-				return "sync-override";	 //$NON-NLS-1$
-			case UnlikelyEqualsArgumentType:
-			case UnlikelyCollectionMethodArgumentType:
-				return "unlikely-arg-type"; //$NON-NLS-1$
-//{ObjectTeams:
-			case NotExactlyOneBasecall :
-				return "basecall"; //$NON-NLS-1$
-			case BaseclassCycle:
-				return "baseclasscycle";  //$NON-NLS-1$
-			case UnsafeRoleInstantiation :
-				return "roleinstantiation";  //$NON-NLS-1$
-//			case EffectlessFieldaccess : // no reason to suppress
-			case EffectlessCallinBinding:
-				return "unused"; //$NON-NLS-1$
-			case FragileCallin :
-				return "fragilecallin";  //$NON-NLS-1$
-//			case UnusedParammap : // no reason to suppress
-			case PotentialAmbiguousPlayedBy :
-				return "ambiguousbinding"; //$NON-NLS-1$
-			case AbstractPotentialRelevantRole :
-				return "abstractrelevantrole"; //$NON-NLS-1$
-			case HiddenLiftingProblem :
-				return "hidden-lifting-problem"; //$NON-NLS-1$
-			case Decapsulation :
-			case DecapsulationWrite :
-				return "decapsulation"; //$NON-NLS-1$
-			case BindingConventions :
-				return "bindingconventions"; //$NON-NLS-1$
-			case AddingInferredCallout :
-				return "inferredcallout"; //$NON-NLS-1$
-			case DeprecatedPathSyntax :
-				return "roletypesyntax"; //$NON-NLS-1$
-			case WeaveIntoSystemClass :
-				return "bindingtosystemclass"; //$NON-NLS-1$
-			case DangerousCallin :
-				return "dangerouscallin"; //$NON-NLS-1$
-			case OverridingFinalRole :
-				return "overridefinalrole"; //$NON-NLS-1$
-			case ExceptionInGuard :
-				return "exceptioninguard"; //$NON-NLS-1$
-			case AmbiguousLowering :
-				return "ambiguouslowering"; //$NON-NLS-1$
-			case AdaptingDeprecated :
-				return "adapt-deprecated"; //$NON-NLS-1$
-			case IgnoringRoleReturn :
-				return "ignoredresult";  //$NON-NLS-1$
-// SH}
-			case APILeak:
-				return "exports"; //$NON-NLS-1$
-			case UnstableAutoModuleName:
-				return "module"; //$NON-NLS-1$
-			case PreviewFeatureUsed:
-				return "preview"; //$NON-NLS-1$
-		}
-		return null;
-	}
-
-	public static IrritantSet warningTokenToIrritants(String warningToken) {
-		// keep in sync with warningTokens and warningTokenFromIrritant
-		if (warningToken == null || warningToken.length() == 0) return null;
-		switch (warningToken.charAt(0)) {
-			case 'a' :
-				if ("all".equals(warningToken)) //$NON-NLS-1$
-					return IrritantSet.ALL;
-				break;
-			case 'b' :
-				if ("boxing".equals(warningToken)) //$NON-NLS-1$
-					return IrritantSet.BOXING;
-				break;
-			case 'c' :
-				if ("cast".equals(warningToken)) //$NON-NLS-1$
-					return IrritantSet.CAST;
-				break;
-			case 'd' :
-				if ("deprecation".equals(warningToken)) //$NON-NLS-1$
-					return IrritantSet.DEPRECATION;
-				if ("dep-ann".equals(warningToken)) //$NON-NLS-1$
-					return IrritantSet.DEP_ANN;
-				break;
-			case 'e' :
-				if ("exports".equals(warningToken)) //$NON-NLS-1$
-					return IrritantSet.API_LEAK;
-				break;
-			case 'f' :
-				if ("fallthrough".equals(warningToken)) //$NON-NLS-1$
-					return IrritantSet.FALLTHROUGH;
-				if ("finally".equals(warningToken)) //$NON-NLS-1$
-					return IrritantSet.FINALLY;
-				break;
-			case 'h' :
-				if ("hiding".equals(warningToken)) //$NON-NLS-1$
-					return IrritantSet.HIDING;
-				break;
-			case 'i' :
-				if ("incomplete-switch".equals(warningToken)) //$NON-NLS-1$
-					return IrritantSet.INCOMPLETE_SWITCH;
-				break;
-			case 'j' :
-				if ("javadoc".equals(warningToken)) //$NON-NLS-1$
-					return IrritantSet.JAVADOC;
-				break;
-			case 'm' :
-				if ("module".equals(warningToken)) //$NON-NLS-1$
-					return IrritantSet.MODULE;
-				break;
-			case 'n' :
-				if ("nls".equals(warningToken)) //$NON-NLS-1$
-					return IrritantSet.NLS;
-				if ("null".equals(warningToken)) //$NON-NLS-1$
-					return IrritantSet.NULL;
-				break;
-			case 'p' :
-				if ("preview".equals(warningToken)) { //$NON-NLS-1$
-					return IrritantSet.PREVIEW;
-				}
-				break;
-			case 'r' :
-				if ("rawtypes".equals(warningToken)) //$NON-NLS-1$
-					return IrritantSet.RAW;
-				if ("resource".equals(warningToken)) //$NON-NLS-1$
-					return IrritantSet.RESOURCE;
-				if ("restriction".equals(warningToken)) //$NON-NLS-1$
-					return IrritantSet.RESTRICTION;
-				if ("removal".equals(warningToken)) //$NON-NLS-1$
-					return IrritantSet.TERMINAL_DEPRECATION;
-				break;
-			case 's' :
-				if ("serial".equals(warningToken)) //$NON-NLS-1$
-					return IrritantSet.SERIAL;
-				if ("static-access".equals(warningToken)) //$NON-NLS-1$
-					return IrritantSet.STATIC_ACCESS;
-				if ("static-method".equals(warningToken)) //$NON-NLS-1$
-					return IrritantSet.STATIC_METHOD;
-				if ("synthetic-access".equals(warningToken)) //$NON-NLS-1$
-					return IrritantSet.SYNTHETIC_ACCESS;
-				if ("super".equals(warningToken)) { //$NON-NLS-1$
-					return IrritantSet.SUPER;
-				}
-				if ("sync-override".equals(warningToken)) //$NON-NLS-1$
-					return IrritantSet.SYNCHRONIZED;
-				break;
-			case 'u' :
-				if ("unused".equals(warningToken)) //$NON-NLS-1$
-					return IrritantSet.UNUSED;
-				if ("unchecked".equals(warningToken)) //$NON-NLS-1$
-					return IrritantSet.UNCHECKED;
-				if ("unqualified-field-access".equals(warningToken)) //$NON-NLS-1$
-					return IrritantSet.UNQUALIFIED_FIELD_ACCESS;
-				if ("unlikely-arg-type".equals(warningToken)) //$NON-NLS-1$
-					return IrritantSet.UNLIKELY_ARGUMENT_TYPE;
-				break;
-		}
-//{ObjectTeams: more tokens:
-		switch (warningToken.charAt(0)) {
-		case 'a' :
-			if ("abstractrelevantrole".equals(warningToken)) //$NON-NLS-1$
-				return IrritantSet.ABSTRACT_POTENTIAL_RELEVANT_ROLE;
-			if ("ambiguousbinding".equals(warningToken)) //$NON-NLS-1$
-				return IrritantSet.POTENTIAL_AMBIGUOUS_PLAYEDBY;
-			if ("ambiguouslowering".equals(warningToken)) //$NON-NLS-1$
-				return IrritantSet.AMBIGUOUS_LOWERING;
-			if ("adapt-deprecated".equals(warningToken)) //$NON-NLS-1$
-				return IrritantSet.ADAPT_DEPRECATED;
-			break;
-		case 'b' :
-			if ("basecall".equals(warningToken)) //$NON-NLS-1$
-				return IrritantSet.NOT_EXACTLY_ONE_BASECALL;
-			else if ("baseclasscycle".equals(warningToken)) //$NON-NLS-1$
-				return IrritantSet.BASECALL_CYCLE;
-			else if ("bindingconventions".equals(warningToken)) //$NON-NLS-1$
-				return IrritantSet.BINDING_CONVENTIONS;
-			else if ("bindingtosystemclass".equals(warningToken)) //$NON-NLS-1$
-				return IrritantSet.WEAVE_INTO_SYSTEM_CLASS;
-			break;
-		case 'd' :
-			if ("decapsulation".equals(warningToken)) //$NON-NLS-1$
-				return IrritantSet.DECAPSULATION;
-			if ("dangerouscallin".equals(warningToken)) //$NON-NLS-1$
-				return IrritantSet.DANGEROUS_CALLIN;
-			break;
-		case 'e' :
-			if ("exceptioninguard".equals(warningToken)) //$NON-NLS-1$
-				return IrritantSet.EXCEPTION_IN_GUARD;
-			break;
-		case 'f' :
-			if ("fragilecallin".equals(warningToken)) //$NON-NLS-1$
-				return IrritantSet.FRAGILE_CALLIN;
-			break;
-		case 'h' :
-			if ("hidden-lifting-problem".equals(warningToken)) //$NON-NLS-1$
-				return IrritantSet.HIDDEN_LIFTING_PROBLEM;
-			break;
-		case 'i' :
-			if ("inferredcallout".equals(warningToken)) //$NON-NLS-1$
-				return IrritantSet.ADDING_INFERRED_CALLOUT;
-			if ("ignoredresult".equals(warningToken)) //$NON-NLS-1$
-				return IrritantSet.IGNORING_ROLE_RETURN;
-			break;
-		case 'o' :
-			if ("overridefinalrole".equals(warningToken)) //$NON-NLS-1$
-				return IrritantSet.OVERRIDING_FINAL_ROLE;
-			break;
-		case 'r' :
-			if ("roleinstantiation".equals(warningToken)) //$NON-NLS-1$
-				return IrritantSet.UNSAFE_ROLE_INSTANTIATION;
-			if ("roletypesyntax".equals(warningToken)) //$NON-NLS-1$
-				return IrritantSet.DEPRECATED_PATH_SYNTAX;
-			break;
-		}
-// SH}
-		return null;
-	}
-
-
-	public Map<String, String> getMap() {
-		Map<String, String> optionsMap = new HashMap<>(30);
-		optionsMap.put(OPTION_LocalVariableAttribute, (this.produceDebugAttributes & ClassFileConstants.ATTR_VARS) != 0 ? GENERATE : DO_NOT_GENERATE);
-		optionsMap.put(OPTION_LineNumberAttribute, (this.produceDebugAttributes & ClassFileConstants.ATTR_LINES) != 0 ? GENERATE : DO_NOT_GENERATE);
-		optionsMap.put(OPTION_SourceFileAttribute, (this.produceDebugAttributes & ClassFileConstants.ATTR_SOURCE) != 0 ? GENERATE : DO_NOT_GENERATE);
-		optionsMap.put(OPTION_MethodParametersAttribute, this.produceMethodParameters ? GENERATE : DO_NOT_GENERATE);
-		optionsMap.put(OPTION_LambdaGenericSignature, this.generateGenericSignatureForLambdaExpressions ? GENERATE : DO_NOT_GENERATE);
-		optionsMap.put(OPTION_PreserveUnusedLocal, this.preserveAllLocalVariables ? PRESERVE : OPTIMIZE_OUT);
-		optionsMap.put(OPTION_DocCommentSupport, this.docCommentSupport ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_ReportMethodWithConstructorName, getSeverityString(MethodWithConstructorName));
-		optionsMap.put(OPTION_ReportOverridingPackageDefaultMethod, getSeverityString(OverriddenPackageDefaultMethod));
-		optionsMap.put(OPTION_ReportDeprecation, getSeverityString(UsingDeprecatedAPI));
-		optionsMap.put(OPTION_ReportTerminalDeprecation, getSeverityString(UsingTerminallyDeprecatedAPI));
-		optionsMap.put(OPTION_ReportDeprecationInDeprecatedCode, this.reportDeprecationInsideDeprecatedCode ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_ReportDeprecationWhenOverridingDeprecatedMethod, this.reportDeprecationWhenOverridingDeprecatedMethod ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_ReportHiddenCatchBlock, getSeverityString(MaskedCatchBlock));
-		optionsMap.put(OPTION_ReportUnusedLocal, getSeverityString(UnusedLocalVariable));
-		optionsMap.put(OPTION_ReportUnusedParameter, getSeverityString(UnusedArgument));
-		optionsMap.put(OPTION_ReportUnusedExceptionParameter, getSeverityString(UnusedExceptionParameter));
-		optionsMap.put(OPTION_ReportUnusedImport, getSeverityString(UnusedImport));
-		optionsMap.put(OPTION_ReportSyntheticAccessEmulation, getSeverityString(AccessEmulation));
-		optionsMap.put(OPTION_ReportNoEffectAssignment, getSeverityString(NoEffectAssignment));
-		optionsMap.put(OPTION_ReportNonExternalizedStringLiteral, getSeverityString(NonExternalizedString));
-		optionsMap.put(OPTION_ReportNoImplicitStringConversion, getSeverityString(NoImplicitStringConversion));
-		optionsMap.put(OPTION_ReportNonStaticAccessToStatic, getSeverityString(NonStaticAccessToStatic));
-		optionsMap.put(OPTION_ReportIndirectStaticAccess, getSeverityString(IndirectStaticAccess));
-		optionsMap.put(OPTION_ReportIncompatibleNonInheritedInterfaceMethod, getSeverityString(IncompatibleNonInheritedInterfaceMethod));
-		optionsMap.put(OPTION_ReportUnusedPrivateMember, getSeverityString(UnusedPrivateMember));
-		optionsMap.put(OPTION_ReportLocalVariableHiding, getSeverityString(LocalVariableHiding));
-		optionsMap.put(OPTION_ReportFieldHiding, getSeverityString(FieldHiding));
-		optionsMap.put(OPTION_ReportTypeParameterHiding, getSeverityString(TypeHiding));
-		optionsMap.put(OPTION_ReportPossibleAccidentalBooleanAssignment, getSeverityString(AccidentalBooleanAssign));
-		optionsMap.put(OPTION_ReportEmptyStatement, getSeverityString(EmptyStatement));
-		optionsMap.put(OPTION_ReportAssertIdentifier, getSeverityString(AssertUsedAsAnIdentifier));
-		optionsMap.put(OPTION_ReportEnumIdentifier, getSeverityString(EnumUsedAsAnIdentifier));
-		optionsMap.put(OPTION_ReportUndocumentedEmptyBlock, getSeverityString(UndocumentedEmptyBlock));
-		optionsMap.put(OPTION_ReportUnnecessaryTypeCheck, getSeverityString(UnnecessaryTypeCheck));
-		optionsMap.put(OPTION_ReportUnnecessaryElse, getSeverityString(UnnecessaryElse));
-		optionsMap.put(OPTION_ReportAutoboxing, getSeverityString(AutoBoxing));
-		optionsMap.put(OPTION_ReportAnnotationSuperInterface, getSeverityString(AnnotationSuperInterface));
-		optionsMap.put(OPTION_ReportIncompleteEnumSwitch, getSeverityString(MissingEnumConstantCase));
-		optionsMap.put(OPTION_ReportMissingEnumCaseDespiteDefault, this.reportMissingEnumCaseDespiteDefault ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_ReportMissingDefaultCase, getSeverityString(MissingDefaultCase));
-		optionsMap.put(OPTION_ReportInvalidJavadoc, getSeverityString(InvalidJavadoc));
-		optionsMap.put(OPTION_ReportInvalidJavadocTagsVisibility, getVisibilityString(this.reportInvalidJavadocTagsVisibility));
-		optionsMap.put(OPTION_ReportInvalidJavadocTags, this.reportInvalidJavadocTags ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_ReportInvalidJavadocTagsDeprecatedRef, this.reportInvalidJavadocTagsDeprecatedRef ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_ReportInvalidJavadocTagsNotVisibleRef, this.reportInvalidJavadocTagsNotVisibleRef ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_ReportMissingJavadocTags, getSeverityString(MissingJavadocTags));
-		optionsMap.put(OPTION_ReportMissingJavadocTagsVisibility, getVisibilityString(this.reportMissingJavadocTagsVisibility));
-		optionsMap.put(OPTION_ReportMissingJavadocTagsOverriding, this.reportMissingJavadocTagsOverriding ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_ReportMissingJavadocTagsMethodTypeParameters, this.reportMissingJavadocTagsMethodTypeParameters ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_ReportMissingJavadocComments, getSeverityString(MissingJavadocComments));
-		optionsMap.put(OPTION_ReportMissingJavadocTagDescription, this.reportMissingJavadocTagDescription);
-		optionsMap.put(OPTION_ReportMissingJavadocCommentsVisibility, getVisibilityString(this.reportMissingJavadocCommentsVisibility));
-		optionsMap.put(OPTION_ReportMissingJavadocCommentsOverriding, this.reportMissingJavadocCommentsOverriding ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_ReportFinallyBlockNotCompletingNormally, getSeverityString(FinallyBlockNotCompleting));
-		optionsMap.put(OPTION_ReportUnusedDeclaredThrownException, getSeverityString(UnusedDeclaredThrownException));
-		optionsMap.put(OPTION_ReportUnusedDeclaredThrownExceptionWhenOverriding, this.reportUnusedDeclaredThrownExceptionWhenOverriding ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_ReportUnusedDeclaredThrownExceptionIncludeDocCommentReference, this.reportUnusedDeclaredThrownExceptionIncludeDocCommentReference ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_ReportUnusedDeclaredThrownExceptionExemptExceptionAndThrowable, this.reportUnusedDeclaredThrownExceptionExemptExceptionAndThrowable ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_ReportUnqualifiedFieldAccess, getSeverityString(UnqualifiedFieldAccess));
-		optionsMap.put(OPTION_ReportUnavoidableGenericTypeProblems, this.reportUnavoidableGenericTypeProblems ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_ReportUncheckedTypeOperation, getSeverityString(UncheckedTypeOperation));
-		optionsMap.put(OPTION_ReportRawTypeReference, getSeverityString(RawTypeReference));
-		optionsMap.put(OPTION_ReportFinalParameterBound, getSeverityString(FinalParameterBound));
-		optionsMap.put(OPTION_ReportMissingSerialVersion, getSeverityString(MissingSerialVersion));
-		optionsMap.put(OPTION_ReportForbiddenReference, getSeverityString(ForbiddenReference));
-		optionsMap.put(OPTION_ReportDiscouragedReference, getSeverityString(DiscouragedReference));
-		optionsMap.put(OPTION_ReportVarargsArgumentNeedCast, getSeverityString(VarargsArgumentNeedCast));
-		optionsMap.put(OPTION_ReportMissingOverrideAnnotation, getSeverityString(MissingOverrideAnnotation));
-		optionsMap.put(OPTION_ReportMissingOverrideAnnotationForInterfaceMethodImplementation, this.reportMissingOverrideAnnotationForInterfaceMethodImplementation ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_ReportMissingDeprecatedAnnotation, getSeverityString(MissingDeprecatedAnnotation));
-		optionsMap.put(OPTION_ReportUnusedLabel, getSeverityString(UnusedLabel));
-		optionsMap.put(OPTION_ReportUnusedTypeArgumentsForMethodInvocation, getSeverityString(UnusedTypeArguments));
-		optionsMap.put(OPTION_Compliance, versionFromJdkLevel(this.complianceLevel));
-		optionsMap.put(OPTION_Release, DISABLED);
-		optionsMap.put(OPTION_Source, versionFromJdkLevel(this.sourceLevel));
-		optionsMap.put(OPTION_TargetPlatform, versionFromJdkLevel(this.targetJDK));
-		optionsMap.put(OPTION_FatalOptionalError, this.treatOptionalErrorAsFatal ? ENABLED : DISABLED);
-		if (this.defaultEncoding != null) {
-			optionsMap.put(OPTION_Encoding, this.defaultEncoding);
-		}
-		optionsMap.put(OPTION_TaskTags, this.taskTags == null ? Util.EMPTY_STRING : new String(CharOperation.concatWith(this.taskTags,',')));
-		optionsMap.put(OPTION_TaskPriorities, this.taskPriorities == null ? Util.EMPTY_STRING : new String(CharOperation.concatWith(this.taskPriorities,',')));
-		optionsMap.put(OPTION_TaskCaseSensitive, this.isTaskCaseSensitive ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_ReportUnusedParameterWhenImplementingAbstract, this.reportUnusedParameterWhenImplementingAbstract ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_ReportUnusedParameterWhenOverridingConcrete, this.reportUnusedParameterWhenOverridingConcrete ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_ReportUnusedParameterIncludeDocCommentReference, this.reportUnusedParameterIncludeDocCommentReference ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_ReportSpecialParameterHidingField, this.reportSpecialParameterHidingField ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_MaxProblemPerUnit, String.valueOf(this.maxProblemsPerUnit));
-		optionsMap.put(OPTION_InlineJsr, this.inlineJsrBytecode ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_ShareCommonFinallyBlocks, this.shareCommonFinallyBlocks ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_ReportNullReference, getSeverityString(NullReference));
-		optionsMap.put(OPTION_ReportPotentialNullReference, getSeverityString(PotentialNullReference));
-		optionsMap.put(OPTION_ReportRedundantNullCheck, getSeverityString(RedundantNullCheck));
-		optionsMap.put(OPTION_SuppressWarnings, this.suppressWarnings ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_SuppressOptionalErrors, this.suppressOptionalErrors ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_ReportUnhandledWarningToken, getSeverityString(UnhandledWarningToken));
-		optionsMap.put(OPTION_ReportUnusedWarningToken, getSeverityString(UnusedWarningToken));
-		optionsMap.put(OPTION_ReportParameterAssignment, getSeverityString(ParameterAssignment));
-		optionsMap.put(OPTION_ReportFallthroughCase, getSeverityString(FallthroughCase));
-		optionsMap.put(OPTION_ReportOverridingMethodWithoutSuperInvocation, getSeverityString(OverridingMethodWithoutSuperInvocation));
-		optionsMap.put(OPTION_GenerateClassFiles, this.generateClassFiles ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_Process_Annotations, this.processAnnotations ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_Store_Annotations, this.storeAnnotations ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_EmulateJavacBug8031744, this.emulateJavacBug8031744 ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_ReportRedundantSuperinterface, getSeverityString(RedundantSuperinterface));
-		optionsMap.put(OPTION_ReportComparingIdentical, getSeverityString(ComparingIdentical));
-		optionsMap.put(OPTION_ReportMissingSynchronizedOnInheritedMethod, getSeverityString(MissingSynchronizedModifierInInheritedMethod));
-		optionsMap.put(OPTION_ReportMissingHashCodeMethod, getSeverityString(ShouldImplementHashcode));
-		optionsMap.put(OPTION_ReportDeadCode, getSeverityString(DeadCode));
-		optionsMap.put(OPTION_ReportDeadCodeInTrivialIfStatement, this.reportDeadCodeInTrivialIfStatement ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_ReportTasks, getSeverityString(Tasks));
-		optionsMap.put(OPTION_ReportUnusedObjectAllocation, getSeverityString(UnusedObjectAllocation));
-		optionsMap.put(OPTION_IncludeNullInfoFromAsserts, this.includeNullInfoFromAsserts ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_ReportMethodCanBeStatic, getSeverityString(MethodCanBeStatic));
-		optionsMap.put(OPTION_ReportMethodCanBePotentiallyStatic, getSeverityString(MethodCanBePotentiallyStatic));
-		optionsMap.put(OPTION_ReportRedundantSpecificationOfTypeArguments, getSeverityString(RedundantSpecificationOfTypeArguments));
-		optionsMap.put(OPTION_ReportUnclosedCloseable, getSeverityString(UnclosedCloseable));
-		optionsMap.put(OPTION_ReportPotentiallyUnclosedCloseable, getSeverityString(PotentiallyUnclosedCloseable));
-		optionsMap.put(OPTION_ReportExplicitlyClosedAutoCloseable, getSeverityString(ExplicitlyClosedAutoCloseable));
-//{ObjectTeams:
-		optionsMap.put(OPTION_Decapsulation, this.decapsulation);
-
-		optionsMap.put(OPTION_ReportNotExactlyOneBasecall, getSeverityString(NotExactlyOneBasecall));
-		optionsMap.put(OPTION_ReportBaseclassCycle, getSeverityString(BaseclassCycle));
-		optionsMap.put(OPTION_ReportUnsafeRoleInstantiation, getSeverityString(UnsafeRoleInstantiation));
-
-		optionsMap.put(OPTION_ReportEffectlessFieldaccess, getSeverityString(EffectlessFieldaccess));
-		optionsMap.put(OPTION_ReportFragileCallin, getSeverityString(FragileCallin));
-		optionsMap.put(OPTION_ReportUnusedParammap, getSeverityString(UnusedParammap));
-
-		optionsMap.put(OPTION_ReportPotentialAmbiguousPlayedby, getSeverityString(PotentialAmbiguousPlayedBy));
-		optionsMap.put(OPTION_ReportAbstractPotentialRelevantRole, getSeverityString(AbstractPotentialRelevantRole));
-		optionsMap.put(OPTION_ReportHiddenLiftingProblem, getSeverityString(HiddenLiftingProblem));
-
-		optionsMap.put(OPTION_ReportDecapsulation, getSeverityString(Decapsulation));
-		optionsMap.put(OPTION_ReportDecapsulationWrite, getSeverityString(DecapsulationWrite));
-		optionsMap.put(OPTION_ReportDeprecatedPathSyntax, getSeverityString(DeprecatedPathSyntax));
-
-		optionsMap.put(OPTION_ReportBindingConventions, getSeverityString(BindingConventions));
-
-		optionsMap.put(OPTION_ReportInferredCallout, getSeverityString(AddingInferredCallout));
-		optionsMap.put(OPTION_ReportWeaveIntoSystemClass, getSeverityString(WeaveIntoSystemClass));
-		optionsMap.put(OPTION_ReportOverrideFinalRole, getSeverityString(OverridingFinalRole));
-		optionsMap.put(OPTION_ReportExceptionInGuard, getSeverityString(ExceptionInGuard));
-		optionsMap.put(OPTION_ReportAmbiguousLowering, getSeverityString(AmbiguousLowering));
-		optionsMap.put(OPTION_ReportAdaptingDeprecated, getSeverityString(AdaptingDeprecated));
-		optionsMap.put(OPTION_ReportIgnoringRoleMethodReturn, getSeverityString(IgnoringRoleReturn));
-		optionsMap.put(OPTION_ReportOtreWeavingIntoJava8, getSeverityString(OTREintoJava8));
-
-		optionsMap.put(OPTION_AllowScopedKeywords, this.allowScopedKeywords? ENABLED : DISABLED);
-		optionsMap.put(OPTION_PureJavaOnly, this.isPureJava ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_WeavingScheme, this.weavingScheme.name());
-// SH}
-		optionsMap.put(OPTION_AnnotationBasedNullAnalysis, this.isAnnotationBasedNullAnalysisEnabled ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_ReportNullSpecViolation, getSeverityString(NullSpecViolation));
-		optionsMap.put(OPTION_ReportNullAnnotationInferenceConflict, getSeverityString(NullAnnotationInferenceConflict));
-		optionsMap.put(OPTION_ReportNullUncheckedConversion, getSeverityString(NullUncheckedConversion));
-		optionsMap.put(OPTION_ReportRedundantNullAnnotation, getSeverityString(RedundantNullAnnotation));
-		optionsMap.put(OPTION_NullableAnnotationName, String.valueOf(CharOperation.concatWith(this.nullableAnnotationName, '.')));
-		optionsMap.put(OPTION_NonNullAnnotationName, String.valueOf(CharOperation.concatWith(this.nonNullAnnotationName, '.')));
-		optionsMap.put(OPTION_NonNullByDefaultAnnotationName, String.valueOf(CharOperation.concatWith(this.nonNullByDefaultAnnotationName, '.')));
-		optionsMap.put(OPTION_NullableAnnotationSecondaryNames, nameListToString(this.nullableAnnotationSecondaryNames));
-		optionsMap.put(OPTION_NonNullAnnotationSecondaryNames, nameListToString(this.nonNullAnnotationSecondaryNames));
-		optionsMap.put(OPTION_NonNullByDefaultAnnotationSecondaryNames, nameListToString(this.nonNullByDefaultAnnotationSecondaryNames));
-		optionsMap.put(OPTION_ReportMissingNonNullByDefaultAnnotation, getSeverityString(MissingNonNullByDefaultAnnotation));
-		optionsMap.put(OPTION_ReportUnusedTypeParameter, getSeverityString(UnusedTypeParameter));
-		optionsMap.put(OPTION_SyntacticNullAnalysisForFields, this.enableSyntacticNullAnalysisForFields ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_InheritNullAnnotations, this.inheritNullAnnotations ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_ReportNonnullParameterAnnotationDropped, getSeverityString(NonnullParameterAnnotationDropped));
-		optionsMap.put(OPTION_ReportUninternedIdentityComparison, this.complainOnUninternedIdentityComparison ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_PessimisticNullAnalysisForFreeTypeVariables, getSeverityString(PessimisticNullAnalysisForFreeTypeVariables));
-		optionsMap.put(OPTION_ReportNonNullTypeVariableFromLegacyInvocation, getSeverityString(NonNullTypeVariableFromLegacyInvocation));
-		optionsMap.put(OPTION_ReportAnnotatedTypeArgumentToUnannotated, getSeverityString(AnnotatedTypeArgumentToUnannotated));
-		optionsMap.put(OPTION_ReportUnlikelyCollectionMethodArgumentType, getSeverityString(UnlikelyCollectionMethodArgumentType));
-		optionsMap.put(OPTION_ReportUnlikelyCollectionMethodArgumentTypeStrict, this.reportUnlikelyCollectionMethodArgumentTypeStrict ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_ReportUnlikelyEqualsArgumentType, getSeverityString(UnlikelyEqualsArgumentType));
-		optionsMap.put(OPTION_ReportAPILeak, getSeverityString(APILeak));
-		optionsMap.put(OPTION_ReportUnstableAutoModuleName, getSeverityString(UnstableAutoModuleName));
-		optionsMap.put(OPTION_EnablePreviews, this.enablePreviewFeatures ? ENABLED : DISABLED);
-		optionsMap.put(OPTION_ReportPreviewFeatures, getSeverityString(PreviewFeatureUsed));
-		optionsMap.put(OPTION_ReportSuppressWarningNotFullyAnalysed, getSeverityString(SuppressWarningsNotAnalysed));
-		optionsMap.put(OPTION_IgnoreUnnamedModuleForSplitPackage, this.ignoreUnnamedModuleForSplitPackage ? ENABLED : DISABLED);
-		return optionsMap;
-	}
-
-	public int getSeverity(int irritant) {
-		if (this.errorThreshold.isSet(irritant)) {
-			if ((irritant & (IrritantSet.GROUP_MASK | UnusedWarningToken)) == UnusedWarningToken) {
-				return ProblemSeverities.Error | ProblemSeverities.Optional; // cannot be treated as fatal - codegen already occurred
-			}
-			return this.treatOptionalErrorAsFatal
-				? ProblemSeverities.Error | ProblemSeverities.Optional | ProblemSeverities.Fatal
-				: ProblemSeverities.Error | ProblemSeverities.Optional;
-		}
-		if (this.warningThreshold.isSet(irritant)) {
-			return ProblemSeverities.Warning | ProblemSeverities.Optional;
-		}
-		if (this.infoThreshold.isSet(irritant)) {
-			return ProblemSeverities.Info | ProblemSeverities.Optional;
-		}
-		return ProblemSeverities.Ignore;
-	}
-
-	public String getSeverityString(int irritant) {
-		if(this.errorThreshold.isSet(irritant))
-			return ERROR;
-		if(this.warningThreshold.isSet(irritant))
-			return WARNING;
-		if (this.infoThreshold.isSet(irritant)) {
-			return INFO;
-		}
-		return IGNORE;
-	}
-	public String getVisibilityString(int level) {
-		switch (level & ExtraCompilerModifiers.AccVisibilityMASK) {
-			case ClassFileConstants.AccPublic:
-				return PUBLIC;
-			case ClassFileConstants.AccProtected:
-				return PROTECTED;
-			case ClassFileConstants.AccPrivate:
-				return PRIVATE;
-			default:
-				return DEFAULT;
-		}
-	}
-
-	public boolean isAnyEnabled(IrritantSet irritants) {
-		return this.warningThreshold.isAnySet(irritants) || this.errorThreshold.isAnySet(irritants)
-					|| this.infoThreshold.isAnySet(irritants);
-	}
-	/*
-	 * Just return the first irritant id that is set to 'ignored'.
-	 */
-	public int getIgnoredIrritant(IrritantSet irritants) {
-		int[] bits = irritants.getBits();
-		for (int i = 0; i < IrritantSet.GROUP_MAX; i++) {
-			int bit = bits[i];
-			for (int b = 0; b < IrritantSet.GROUP_SHIFT; b++) {
-				int single = bit & (1 << b);
-				if (single > 0) {
-					single |= (i << IrritantSet.GROUP_SHIFT);
-					if (single == MissingNonNullByDefaultAnnotation)
-						continue;
-					if (!(this.warningThreshold.isSet(single) || this.errorThreshold.isSet(single) || this.infoThreshold.isSet(single))) {
-						return single;
-					}
-				}
-			}
-		}
-		return 0;
-	}
-
-	protected void resetDefaults() {
-		// problem default severities defined on IrritantSet
-		this.errorThreshold = new IrritantSet(IrritantSet.COMPILER_DEFAULT_ERRORS);
-		this.warningThreshold = new IrritantSet(IrritantSet.COMPILER_DEFAULT_WARNINGS);
-		this.infoThreshold = new IrritantSet(IrritantSet.COMPILER_DEFAULT_INFOS);
-
-		// by default only lines and source attributes are generated.
-		this.produceDebugAttributes = ClassFileConstants.ATTR_SOURCE | ClassFileConstants.ATTR_LINES;
-		this.complianceLevel = this.originalComplianceLevel = ClassFileConstants.JDK1_4; // by default be compliant with 1.4
-		this.sourceLevel = this.originalSourceLevel = ClassFileConstants.JDK1_3; //1.3 source behavior by default
-		this.targetJDK = ClassFileConstants.JDK1_2; // default generates for JVM1.2
-
-		this.defaultEncoding = null; // will use the platform default encoding
-
-		// print what unit is being processed
-		this.verbose = Compiler.DEBUG;
-
-		this.produceReferenceInfo = false; // no reference info by default
-
-		// indicates if unused/optimizable local variables need to be preserved (debugging purpose)
-		this.preserveAllLocalVariables = false;
-
-		this.produceMethodParameters = false;
-
-		// indicates whether literal expressions are inlined at parse-time or not
-		this.parseLiteralExpressionsAsConstants = true;
-
-		// max problems per compilation unit
-		this.maxProblemsPerUnit = 100; // no more than 100 problems per default
-
-		// tags used to recognize tasks in comments
-		this.taskTags = null;
-		this.taskPriorities = null;
-		this.isTaskCaseSensitive = true;
-
-		// deprecation report
-		this.reportDeprecationInsideDeprecatedCode = false;
-		this.reportDeprecationWhenOverridingDeprecatedMethod = false;
-
-		// unused parameters report
-		this.reportUnusedParameterWhenImplementingAbstract = false;
-		this.reportUnusedParameterWhenOverridingConcrete = false;
-		this.reportUnusedParameterIncludeDocCommentReference = true;
-
-		// unused declaration of thrown exception
-		this.reportUnusedDeclaredThrownExceptionWhenOverriding = false;
-		this.reportUnusedDeclaredThrownExceptionIncludeDocCommentReference = true;
-		this.reportUnusedDeclaredThrownExceptionExemptExceptionAndThrowable = true;
-
-		// constructor/setter parameter hiding
-		this.reportSpecialParameterHidingField = false;
-
-		this.reportUnavoidableGenericTypeProblems = true;
-
-		// check javadoc comments tags
-		this.reportInvalidJavadocTagsVisibility = ClassFileConstants.AccPublic;
-		this.reportInvalidJavadocTags = false;
-		this.reportInvalidJavadocTagsDeprecatedRef = false;
-		this.reportInvalidJavadocTagsNotVisibleRef = false;
-		this.reportMissingJavadocTagDescription = RETURN_TAG;
-
-		// check missing javadoc tags
-		this.reportMissingJavadocTagsVisibility = ClassFileConstants.AccPublic;
-		this.reportMissingJavadocTagsOverriding = false;
-		this.reportMissingJavadocTagsMethodTypeParameters = false;
-
-		// check missing javadoc comments
-		this.reportMissingJavadocCommentsVisibility = ClassFileConstants.AccPublic;
-		this.reportMissingJavadocCommentsOverriding = false;
-
-		// JSR bytecode inlining and sharing
-		this.inlineJsrBytecode = false;
-		this.shareCommonFinallyBlocks = false;
-
-		// javadoc comment support
-		this.docCommentSupport = false;
-
-		// suppress warning annotation
-		this.suppressWarnings = true;
-
-		// suppress also optional errors
-		this.suppressOptionalErrors = false;
-
-		// treat optional error as non fatal
-		this.treatOptionalErrorAsFatal = false;
-
-		// parser perform statements recovery
-		this.performMethodsFullRecovery = true;
-
-		// parser perform statements recovery
-		this.performStatementsRecovery = true;
-
-		// store annotations
-		this.storeAnnotations = false;
-
-		// annotation processing
-		this.generateClassFiles = true;
-
-		// enable annotation processing by default only in batch mode
-		this.processAnnotations = false;
-
-		// disable missing override annotation reporting for interface method implementation
-		this.reportMissingOverrideAnnotationForInterfaceMethodImplementation = true;
-
-		// dead code detection
-		this.reportDeadCodeInTrivialIfStatement = false;
-
-		// ignore method bodies
-		this.ignoreMethodBodies = false;
-
-		this.ignoreSourceFolderWarningOption = false;
-
-		// allow null info from asserts to be considered downstream by default
-		this.includeNullInfoFromAsserts = false;
-
-		this.isAnnotationBasedNullAnalysisEnabled = false;
-		this.nullableAnnotationName = DEFAULT_NULLABLE_ANNOTATION_NAME;
-		this.nonNullAnnotationName = DEFAULT_NONNULL_ANNOTATION_NAME;
-		this.nonNullByDefaultAnnotationName = DEFAULT_NONNULLBYDEFAULT_ANNOTATION_NAME;
-		this.intendedDefaultNonNullness = 0;
-		this.enableSyntacticNullAnalysisForFields = false;
-		this.inheritNullAnnotations = false;
-
-		this.analyseResourceLeaks = true;
-
-		this.reportMissingEnumCaseDespiteDefault = false;
-
-		this.complainOnUninternedIdentityComparison = false;
-		this.enablePreviewFeatures = false;
-
-		this.enableJdtDebugCompileMode = false;
-		this.ignoreUnnamedModuleForSplitPackage = false;
-	}
-
-	public void set(Map<String, String> optionsMap) {
-		String optionValue;
-		if ((optionValue = optionsMap.get(OPTION_LocalVariableAttribute)) != null) {
-			if (GENERATE.equals(optionValue)) {
-				this.produceDebugAttributes |= ClassFileConstants.ATTR_VARS;
-			} else if (DO_NOT_GENERATE.equals(optionValue)) {
-				this.produceDebugAttributes &= ~ClassFileConstants.ATTR_VARS;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_LineNumberAttribute)) != null) {
-			if (GENERATE.equals(optionValue)) {
-				this.produceDebugAttributes |= ClassFileConstants.ATTR_LINES;
-			} else if (DO_NOT_GENERATE.equals(optionValue)) {
-				this.produceDebugAttributes &= ~ClassFileConstants.ATTR_LINES;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_SourceFileAttribute)) != null) {
-			if (GENERATE.equals(optionValue)) {
-				this.produceDebugAttributes |= ClassFileConstants.ATTR_SOURCE;
-			} else if (DO_NOT_GENERATE.equals(optionValue)) {
-				this.produceDebugAttributes &= ~ClassFileConstants.ATTR_SOURCE;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_PreserveUnusedLocal)) != null) {
-			if (PRESERVE.equals(optionValue)) {
-				this.preserveAllLocalVariables = true;
-			} else if (OPTIMIZE_OUT.equals(optionValue)) {
-				this.preserveAllLocalVariables = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_ReportDeprecationInDeprecatedCode)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.reportDeprecationInsideDeprecatedCode = true;
-			} else if (DISABLED.equals(optionValue)) {
-				this.reportDeprecationInsideDeprecatedCode = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_ReportDeprecationWhenOverridingDeprecatedMethod)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.reportDeprecationWhenOverridingDeprecatedMethod = true;
-			} else if (DISABLED.equals(optionValue)) {
-				this.reportDeprecationWhenOverridingDeprecatedMethod = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_ReportUnusedDeclaredThrownExceptionWhenOverriding)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.reportUnusedDeclaredThrownExceptionWhenOverriding = true;
-			} else if (DISABLED.equals(optionValue)) {
-				this.reportUnusedDeclaredThrownExceptionWhenOverriding = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_ReportUnusedDeclaredThrownExceptionIncludeDocCommentReference)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.reportUnusedDeclaredThrownExceptionIncludeDocCommentReference = true;
-			} else if (DISABLED.equals(optionValue)) {
-				this.reportUnusedDeclaredThrownExceptionIncludeDocCommentReference = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_ReportUnusedDeclaredThrownExceptionExemptExceptionAndThrowable)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.reportUnusedDeclaredThrownExceptionExemptExceptionAndThrowable = true;
-			} else if (DISABLED.equals(optionValue)) {
-				this.reportUnusedDeclaredThrownExceptionExemptExceptionAndThrowable = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_Compliance)) != null) {
-			long level = versionToJdkLevel(optionValue);
-			if (level != 0) this.complianceLevel = this.originalComplianceLevel = level;
-		}
-		if ((optionValue = optionsMap.get(OPTION_Source)) != null) {
-			long level = versionToJdkLevel(optionValue);
-			if (level != 0) this.sourceLevel = this.originalSourceLevel = level;
-		}
-		if ((optionValue = optionsMap.get(OPTION_TargetPlatform)) != null) {
-			long level = versionToJdkLevel(optionValue);
-			if (level != 0) {
-				if (this.enablePreviewFeatures) {
-					level |= ClassFileConstants.MINOR_VERSION_PREVIEW;
-				}
-				this.targetJDK = level;
-			}
-			if (this.targetJDK >= ClassFileConstants.JDK1_5) this.inlineJsrBytecode = true; // forced from 1.5 mode on
-		}
-		if ((optionValue = optionsMap.get(OPTION_Encoding)) != null) {
-			this.defaultEncoding = null;
-			String stringValue = optionValue;
-			if (stringValue.length() > 0){
-				try {
-					new InputStreamReader(new ByteArrayInputStream(new byte[0]), stringValue);
-					this.defaultEncoding = stringValue;
-				} catch(UnsupportedEncodingException e){
-					// ignore unsupported encoding
-				}
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_ReportUnusedParameterWhenImplementingAbstract)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.reportUnusedParameterWhenImplementingAbstract = true;
-			} else if (DISABLED.equals(optionValue)) {
-				this.reportUnusedParameterWhenImplementingAbstract = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_ReportUnusedParameterWhenOverridingConcrete)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.reportUnusedParameterWhenOverridingConcrete = true;
-			} else if (DISABLED.equals(optionValue)) {
-				this.reportUnusedParameterWhenOverridingConcrete = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_ReportUnusedParameterIncludeDocCommentReference)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.reportUnusedParameterIncludeDocCommentReference = true;
-			} else if (DISABLED.equals(optionValue)) {
-				this.reportUnusedParameterIncludeDocCommentReference = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_ReportSpecialParameterHidingField)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.reportSpecialParameterHidingField = true;
-			} else if (DISABLED.equals(optionValue)) {
-				this.reportSpecialParameterHidingField = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_ReportUnavoidableGenericTypeProblems)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.reportUnavoidableGenericTypeProblems = true;
-			} else if (DISABLED.equals(optionValue)) {
-				this.reportUnavoidableGenericTypeProblems = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_ReportDeadCodeInTrivialIfStatement )) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.reportDeadCodeInTrivialIfStatement = true;
-			} else if (DISABLED.equals(optionValue)) {
-				this.reportDeadCodeInTrivialIfStatement = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_MaxProblemPerUnit)) != null) {
-			String stringValue = optionValue;
-			try {
-				int val = Integer.parseInt(stringValue);
-				if (val >= 0) this.maxProblemsPerUnit = val;
-			} catch(NumberFormatException e){
-				// ignore ill-formatted limit
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_TaskTags)) != null) {
-			String stringValue = optionValue;
-			if (stringValue.length() == 0) {
-				this.taskTags = null;
-			} else {
-				this.taskTags = CharOperation.splitAndTrimOn(',', stringValue.toCharArray());
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_TaskPriorities)) != null) {
-			String stringValue = optionValue;
-			if (stringValue.length() == 0) {
-				this.taskPriorities = null;
-			} else {
-				this.taskPriorities = CharOperation.splitAndTrimOn(',', stringValue.toCharArray());
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_TaskCaseSensitive)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.isTaskCaseSensitive = true;
-			} else if (DISABLED.equals(optionValue)) {
-				this.isTaskCaseSensitive = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_InlineJsr)) != null) {
-			if (this.targetJDK < ClassFileConstants.JDK1_5) { // only optional if target < 1.5 (inlining on from 1.5 on)
-				if (ENABLED.equals(optionValue)) {
-					this.inlineJsrBytecode = true;
-				} else if (DISABLED.equals(optionValue)) {
-					this.inlineJsrBytecode = false;
-				}
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_ShareCommonFinallyBlocks)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.shareCommonFinallyBlocks = true;
-			} else if (DISABLED.equals(optionValue)) {
-				this.shareCommonFinallyBlocks = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_MethodParametersAttribute)) != null) {
-			if (GENERATE.equals(optionValue)) {
-				this.produceMethodParameters = true;
-			} else if (DO_NOT_GENERATE.equals(optionValue)) {
-				this.produceMethodParameters = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_LambdaGenericSignature)) != null) {
-			if (GENERATE.equals(optionValue)) {
-				this.generateGenericSignatureForLambdaExpressions = true;
-			} else if (DO_NOT_GENERATE.equals(optionValue)) {
-				this.generateGenericSignatureForLambdaExpressions = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_SuppressWarnings)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.suppressWarnings = true;
-			} else if (DISABLED.equals(optionValue)) {
-				this.suppressWarnings = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_SuppressOptionalErrors)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.suppressOptionalErrors = true;
-			} else if (DISABLED.equals(optionValue)) {
-				this.suppressOptionalErrors = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_FatalOptionalError)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.treatOptionalErrorAsFatal = true;
-			} else if (DISABLED.equals(optionValue)) {
-				this.treatOptionalErrorAsFatal = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_ReportMissingOverrideAnnotationForInterfaceMethodImplementation)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.reportMissingOverrideAnnotationForInterfaceMethodImplementation = true;
-			} else if (DISABLED.equals(optionValue)) {
-				this.reportMissingOverrideAnnotationForInterfaceMethodImplementation = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_IncludeNullInfoFromAsserts)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.includeNullInfoFromAsserts = true;
-			} else if (DISABLED.equals(optionValue)) {
-				this.includeNullInfoFromAsserts = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_ReportMethodWithConstructorName)) != null) updateSeverity(MethodWithConstructorName, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportOverridingPackageDefaultMethod)) != null) updateSeverity(OverriddenPackageDefaultMethod, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportDeprecation)) != null) updateSeverity(UsingDeprecatedAPI, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportTerminalDeprecation)) != null) updateSeverity(UsingTerminallyDeprecatedAPI, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportHiddenCatchBlock)) != null) updateSeverity(MaskedCatchBlock, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportUnusedLocal)) != null) updateSeverity(UnusedLocalVariable, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportUnusedParameter)) != null) updateSeverity(UnusedArgument, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportUnusedExceptionParameter)) != null) updateSeverity(UnusedExceptionParameter, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportUnusedImport)) != null) updateSeverity(UnusedImport, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportUnusedPrivateMember)) != null) updateSeverity(UnusedPrivateMember, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportUnusedDeclaredThrownException)) != null) updateSeverity(UnusedDeclaredThrownException, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportNoImplicitStringConversion)) != null) updateSeverity(NoImplicitStringConversion, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportSyntheticAccessEmulation)) != null) updateSeverity(AccessEmulation, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportLocalVariableHiding)) != null) updateSeverity(LocalVariableHiding, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportFieldHiding)) != null) updateSeverity(FieldHiding, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportTypeParameterHiding)) != null) updateSeverity(TypeHiding, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportPossibleAccidentalBooleanAssignment)) != null) updateSeverity(AccidentalBooleanAssign, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportEmptyStatement)) != null) updateSeverity(EmptyStatement, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportNonExternalizedStringLiteral)) != null) updateSeverity(NonExternalizedString, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportAssertIdentifier)) != null) updateSeverity(AssertUsedAsAnIdentifier, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportEnumIdentifier)) != null) updateSeverity(EnumUsedAsAnIdentifier, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportNonStaticAccessToStatic)) != null) updateSeverity(NonStaticAccessToStatic, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportIndirectStaticAccess)) != null) updateSeverity(IndirectStaticAccess, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportIncompatibleNonInheritedInterfaceMethod)) != null) updateSeverity(IncompatibleNonInheritedInterfaceMethod, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportUndocumentedEmptyBlock)) != null) updateSeverity(UndocumentedEmptyBlock, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportUnnecessaryTypeCheck)) != null) updateSeverity(UnnecessaryTypeCheck, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportUnnecessaryElse)) != null) updateSeverity(UnnecessaryElse, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportFinallyBlockNotCompletingNormally)) != null) updateSeverity(FinallyBlockNotCompleting, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportUnqualifiedFieldAccess)) != null) updateSeverity(UnqualifiedFieldAccess, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportNoEffectAssignment)) != null) updateSeverity(NoEffectAssignment, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportUncheckedTypeOperation)) != null) updateSeverity(UncheckedTypeOperation, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportRawTypeReference)) != null) updateSeverity(RawTypeReference, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportFinalParameterBound)) != null) updateSeverity(FinalParameterBound, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportMissingSerialVersion)) != null) updateSeverity(MissingSerialVersion, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportForbiddenReference)) != null) updateSeverity(ForbiddenReference, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportDiscouragedReference)) != null) updateSeverity(DiscouragedReference, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportVarargsArgumentNeedCast)) != null) updateSeverity(VarargsArgumentNeedCast, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportNullReference)) != null) updateSeverity(NullReference, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportPotentialNullReference)) != null) updateSeverity(PotentialNullReference, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportRedundantNullCheck)) != null) updateSeverity(RedundantNullCheck, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportAutoboxing)) != null) updateSeverity(AutoBoxing, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportAnnotationSuperInterface)) != null) updateSeverity(AnnotationSuperInterface, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportMissingOverrideAnnotation)) != null) updateSeverity(MissingOverrideAnnotation, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportMissingDeprecatedAnnotation)) != null) updateSeverity(MissingDeprecatedAnnotation, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportIncompleteEnumSwitch)) != null) updateSeverity(MissingEnumConstantCase, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportMissingEnumCaseDespiteDefault)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.reportMissingEnumCaseDespiteDefault = true;
-			} else if (DISABLED.equals(optionValue)) {
-				this.reportMissingEnumCaseDespiteDefault = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_ReportMissingDefaultCase)) != null) updateSeverity(MissingDefaultCase, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportUnhandledWarningToken)) != null) updateSeverity(UnhandledWarningToken, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportUnusedWarningToken)) != null) updateSeverity(UnusedWarningToken, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportUnusedLabel)) != null) updateSeverity(UnusedLabel, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportParameterAssignment)) != null) updateSeverity(ParameterAssignment, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportFallthroughCase)) != null) updateSeverity(FallthroughCase, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportOverridingMethodWithoutSuperInvocation)) != null) updateSeverity(OverridingMethodWithoutSuperInvocation, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportUnusedTypeArgumentsForMethodInvocation)) != null) updateSeverity(UnusedTypeArguments, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportRedundantSuperinterface)) != null) updateSeverity(RedundantSuperinterface, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportComparingIdentical)) != null) updateSeverity(ComparingIdentical, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportMissingSynchronizedOnInheritedMethod)) != null) updateSeverity(MissingSynchronizedModifierInInheritedMethod, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportMissingHashCodeMethod)) != null) updateSeverity(ShouldImplementHashcode, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportDeadCode)) != null) updateSeverity(DeadCode, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportTasks)) != null) updateSeverity(Tasks, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportUnusedObjectAllocation)) != null) updateSeverity(UnusedObjectAllocation, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportMethodCanBeStatic)) != null) updateSeverity(MethodCanBeStatic, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportMethodCanBePotentiallyStatic)) != null) updateSeverity(MethodCanBePotentiallyStatic, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportRedundantSpecificationOfTypeArguments)) != null) updateSeverity(RedundantSpecificationOfTypeArguments, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportUnclosedCloseable)) != null) updateSeverity(UnclosedCloseable, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportPotentiallyUnclosedCloseable)) != null) updateSeverity(PotentiallyUnclosedCloseable, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportExplicitlyClosedAutoCloseable)) != null) updateSeverity(ExplicitlyClosedAutoCloseable, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportUnusedTypeParameter)) != null) updateSeverity(UnusedTypeParameter, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportUnlikelyCollectionMethodArgumentType)) != null) updateSeverity(UnlikelyCollectionMethodArgumentType, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportUnlikelyCollectionMethodArgumentTypeStrict)) != null) {
-			this.reportUnlikelyCollectionMethodArgumentTypeStrict = ENABLED.equals(optionValue);
-		}
-		if ((optionValue = optionsMap.get(OPTION_ReportUnlikelyEqualsArgumentType)) != null) updateSeverity(UnlikelyEqualsArgumentType, optionValue);
-		if (getSeverity(UnclosedCloseable) == ProblemSeverities.Ignore
-				&& getSeverity(PotentiallyUnclosedCloseable) == ProblemSeverities.Ignore
-				&& getSeverity(ExplicitlyClosedAutoCloseable) == ProblemSeverities.Ignore) {
-			this.analyseResourceLeaks = false;
-		} else {
-			this.analyseResourceLeaks = true;
-		}
-//{ObjectTeams:
-		if ((optionValue = optionsMap.get(OPTION_ReportNotExactlyOneBasecall)) != null) updateSeverity(NotExactlyOneBasecall, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportBaseclassCycle)) != null) updateSeverity(BaseclassCycle, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportUnsafeRoleInstantiation)) != null) updateSeverity(UnsafeRoleInstantiation, optionValue);
-
-		if ((optionValue = optionsMap.get(OPTION_ReportEffectlessFieldaccess)) != null) updateSeverity(EffectlessFieldaccess, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportFragileCallin)) != null) updateSeverity(FragileCallin, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportUnusedParammap)) != null) updateSeverity(UnusedParammap, optionValue);
-
-		if ((optionValue = optionsMap.get(OPTION_ReportPotentialAmbiguousPlayedby)) != null) updateSeverity(PotentialAmbiguousPlayedBy, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportAbstractPotentialRelevantRole)) != null) updateSeverity(AbstractPotentialRelevantRole, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportHiddenLiftingProblem)) != null) updateSeverity(HiddenLiftingProblem, optionValue);
-
-		if ((optionValue = optionsMap.get(OPTION_ReportDecapsulation)) != null) updateSeverity(Decapsulation, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportDecapsulationWrite)) != null) updateSeverity(DecapsulationWrite, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportDeprecatedPathSyntax)) != null) updateSeverity(DeprecatedPathSyntax, optionValue);
-
-		if ((optionValue = optionsMap.get(OPTION_ReportBindingConventions)) != null) updateSeverity(BindingConventions, optionValue);
-
-		if ((optionValue = optionsMap.get(OPTION_ReportInferredCallout)) != null) updateSeverity(AddingInferredCallout, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportWeaveIntoSystemClass)) != null) updateSeverity(WeaveIntoSystemClass, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportOverrideFinalRole)) != null) updateSeverity(OverridingFinalRole, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportExceptionInGuard)) != null) updateSeverity(ExceptionInGuard, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportAmbiguousLowering)) != null) updateSeverity(AmbiguousLowering, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportAdaptingDeprecated)) != null) updateSeverity(AdaptingDeprecated, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportIgnoringRoleMethodReturn)) != null) updateSeverity(IgnoringRoleReturn, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportOtreWeavingIntoJava8)) != null) updateSeverity(OTREintoJava8, optionValue);
-
-		if ((optionValue = optionsMap.get(OPTION_AllowScopedKeywords)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.allowScopedKeywords = true;
-			} else if (DISABLED.equals(optionValue)) {
-				this.allowScopedKeywords = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_PureJavaOnly)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.isPureJava = true;
-				this.allowScopedKeywords = true; // extremely scoped: disabled
-			} else if (DISABLED.equals(optionValue)) {
-				this.isPureJava = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_Decapsulation)) != null) {
-			this.decapsulation = optionValue;
-		}
-		if ((optionValue = optionsMap.get(OPTION_WeavingScheme)) != null) {
-			try {
-				this.weavingScheme = WeavingScheme.valueOf(optionValue);
-			} catch (IllegalArgumentException iae) {
-				// ignore illegal value
-			}
-		}
-// SH}
-
-		if ((optionValue = optionsMap.get(OPTION_ReportAPILeak)) != null) updateSeverity(APILeak, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportUnstableAutoModuleName)) != null) updateSeverity(UnstableAutoModuleName, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_AnnotationBasedNullAnalysis)) != null) {
-			this.isAnnotationBasedNullAnalysisEnabled = ENABLED.equals(optionValue);
-		}
-		if (this.isAnnotationBasedNullAnalysisEnabled) {
-			this.storeAnnotations = true;
-			if ((optionValue = optionsMap.get(OPTION_ReportNullSpecViolation)) != null) {
-				if (ERROR.equals(optionValue)) {
-					this.errorThreshold.set(NullSpecViolation);
-					this.warningThreshold.clear(NullSpecViolation);
-				} else if (WARNING.equals(optionValue)) {
-					this.errorThreshold.clear(NullSpecViolation);
-					this.warningThreshold.set(NullSpecViolation);
-				}
-				// "ignore" is not valid for this option
-			}
-			if ((optionValue = optionsMap.get(OPTION_ReportNullAnnotationInferenceConflict)) != null) updateSeverity(NullAnnotationInferenceConflict, optionValue);
-			if ((optionValue = optionsMap.get(OPTION_ReportNullUncheckedConversion)) != null) updateSeverity(NullUncheckedConversion, optionValue);
-			if ((optionValue = optionsMap.get(OPTION_ReportRedundantNullAnnotation)) != null) updateSeverity(RedundantNullAnnotation, optionValue);
-			if ((optionValue = optionsMap.get(OPTION_NullableAnnotationName)) != null) {
-				this.nullableAnnotationName = CharOperation.splitAndTrimOn('.', optionValue.toCharArray());
-			}
-			if ((optionValue = optionsMap.get(OPTION_NonNullAnnotationName)) != null) {
-				this.nonNullAnnotationName = CharOperation.splitAndTrimOn('.', optionValue.toCharArray());
-			}
-			if ((optionValue = optionsMap.get(OPTION_NonNullByDefaultAnnotationName)) != null) {
-				this.nonNullByDefaultAnnotationName = CharOperation.splitAndTrimOn('.', optionValue.toCharArray());
-			}
-			if ((optionValue = optionsMap.get(OPTION_NullableAnnotationSecondaryNames)) != null) {
-				this.nullableAnnotationSecondaryNames = stringToNameList(optionValue);
-			}
-			if ((optionValue = optionsMap.get(OPTION_NonNullAnnotationSecondaryNames)) != null) {
-				this.nonNullAnnotationSecondaryNames = stringToNameList(optionValue);
-			}
-			if ((optionValue = optionsMap.get(OPTION_NonNullByDefaultAnnotationSecondaryNames)) != null) {
-				this.nonNullByDefaultAnnotationSecondaryNames = stringToNameList(optionValue);
-			}
-			if ((optionValue = optionsMap.get(OPTION_ReportMissingNonNullByDefaultAnnotation)) != null) updateSeverity(MissingNonNullByDefaultAnnotation, optionValue);
-			if ((optionValue = optionsMap.get(OPTION_SyntacticNullAnalysisForFields)) != null) {
-				this.enableSyntacticNullAnalysisForFields = ENABLED.equals(optionValue);
-			}
-			if ((optionValue = optionsMap.get(OPTION_InheritNullAnnotations)) != null) {
-				this.inheritNullAnnotations = ENABLED.equals(optionValue);
-			}
-			if ((optionValue = optionsMap.get(OPTION_ReportNonnullParameterAnnotationDropped)) != null) updateSeverity(NonnullParameterAnnotationDropped, optionValue);
-			if ((optionValue = optionsMap.get(OPTION_ReportAnnotatedTypeArgumentToUnannotated)) != null) updateSeverity(AnnotatedTypeArgumentToUnannotated, optionValue);
-			if ((optionValue = optionsMap.get(OPTION_PessimisticNullAnalysisForFreeTypeVariables)) != null) updateSeverity(PessimisticNullAnalysisForFreeTypeVariables, optionValue);
-			if (getSeverity(PessimisticNullAnalysisForFreeTypeVariables) == ProblemSeverities.Ignore) {
-				this.pessimisticNullAnalysisForFreeTypeVariablesEnabled = false;
-			} else {
-				this.pessimisticNullAnalysisForFreeTypeVariablesEnabled = true;
-			}
-			if ((optionValue = optionsMap.get(OPTION_ReportNonNullTypeVariableFromLegacyInvocation)) != null) updateSeverity(NonNullTypeVariableFromLegacyInvocation, optionValue);
-		}
-
-		// Javadoc options
-		if ((optionValue = optionsMap.get(OPTION_DocCommentSupport)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.docCommentSupport = true;
-			} else if (DISABLED.equals(optionValue)) {
-				this.docCommentSupport = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_ReportInvalidJavadoc)) != null) {
-			updateSeverity(InvalidJavadoc, optionValue);
-		}
-		if ( (optionValue = optionsMap.get(OPTION_ReportInvalidJavadocTagsVisibility)) != null) {
-			if (PUBLIC.equals(optionValue)) {
-				this.reportInvalidJavadocTagsVisibility = ClassFileConstants.AccPublic;
-			} else if (PROTECTED.equals(optionValue)) {
-				this.reportInvalidJavadocTagsVisibility = ClassFileConstants.AccProtected;
-			} else if (DEFAULT.equals(optionValue)) {
-				this.reportInvalidJavadocTagsVisibility = ClassFileConstants.AccDefault;
-			} else if (PRIVATE.equals(optionValue)) {
-				this.reportInvalidJavadocTagsVisibility = ClassFileConstants.AccPrivate;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_ReportInvalidJavadocTags)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.reportInvalidJavadocTags = true;
-			} else if (DISABLED.equals(optionValue)) {
-				this.reportInvalidJavadocTags = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_ReportInvalidJavadocTagsDeprecatedRef)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.reportInvalidJavadocTagsDeprecatedRef = true;
-			} else if (DISABLED.equals(optionValue)) {
-				this.reportInvalidJavadocTagsDeprecatedRef = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_ReportInvalidJavadocTagsNotVisibleRef)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.reportInvalidJavadocTagsNotVisibleRef = true;
-			} else if (DISABLED.equals(optionValue)) {
-				this.reportInvalidJavadocTagsNotVisibleRef = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_ReportMissingJavadocTags)) != null) {
-			updateSeverity(MissingJavadocTags, optionValue);
-		}
-		if ((optionValue = optionsMap.get(OPTION_ReportMissingJavadocTagsVisibility)) != null) {
-			if (PUBLIC.equals(optionValue)) {
-				this.reportMissingJavadocTagsVisibility = ClassFileConstants.AccPublic;
-			} else if (PROTECTED.equals(optionValue)) {
-				this.reportMissingJavadocTagsVisibility = ClassFileConstants.AccProtected;
-			} else if (DEFAULT.equals(optionValue)) {
-				this.reportMissingJavadocTagsVisibility = ClassFileConstants.AccDefault;
-			} else if (PRIVATE.equals(optionValue)) {
-				this.reportMissingJavadocTagsVisibility = ClassFileConstants.AccPrivate;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_ReportMissingJavadocTagsOverriding)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.reportMissingJavadocTagsOverriding = true;
-			} else if (DISABLED.equals(optionValue)) {
-				this.reportMissingJavadocTagsOverriding = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_ReportMissingJavadocTagsMethodTypeParameters)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.reportMissingJavadocTagsMethodTypeParameters = true;
-			} else if (DISABLED.equals(optionValue)) {
-				this.reportMissingJavadocTagsMethodTypeParameters = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_ReportMissingJavadocComments)) != null) {
-			updateSeverity(MissingJavadocComments, optionValue);
-		}
-		if ((optionValue = optionsMap.get(OPTION_ReportMissingJavadocTagDescription)) != null) {
-			this.reportMissingJavadocTagDescription = optionValue;
-		}
-		if ((optionValue = optionsMap.get(OPTION_ReportMissingJavadocCommentsVisibility)) != null) {
-			if (PUBLIC.equals(optionValue)) {
-				this.reportMissingJavadocCommentsVisibility = ClassFileConstants.AccPublic;
-			} else if (PROTECTED.equals(optionValue)) {
-				this.reportMissingJavadocCommentsVisibility = ClassFileConstants.AccProtected;
-			} else if (DEFAULT.equals(optionValue)) {
-				this.reportMissingJavadocCommentsVisibility = ClassFileConstants.AccDefault;
-			} else if (PRIVATE.equals(optionValue)) {
-				this.reportMissingJavadocCommentsVisibility = ClassFileConstants.AccPrivate;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_ReportMissingJavadocCommentsOverriding)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.reportMissingJavadocCommentsOverriding = true;
-			} else if (DISABLED.equals(optionValue)) {
-				this.reportMissingJavadocCommentsOverriding = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_GenerateClassFiles)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.generateClassFiles = true;
-			} else if (DISABLED.equals(optionValue)) {
-				this.generateClassFiles = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_Process_Annotations)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.processAnnotations = true;
-				this.storeAnnotations = true; // annotation processing requires annotation to be stored
-			} else if (DISABLED.equals(optionValue)) {
-				this.processAnnotations = false;
-				if (!this.isAnnotationBasedNullAnalysisEnabled)
-					this.storeAnnotations = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_Store_Annotations)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.storeAnnotations = true;
-			} else if (DISABLED.equals(optionValue)) {
-				if (!this.isAnnotationBasedNullAnalysisEnabled && !this.processAnnotations)
-					this.storeAnnotations = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_EmulateJavacBug8031744)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.emulateJavacBug8031744 = true;
-			} else if (DISABLED.equals(optionValue)) {
-				this.emulateJavacBug8031744 = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_ReportUninternedIdentityComparison)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.complainOnUninternedIdentityComparison = true;
-			} else if (DISABLED.equals(optionValue)) {
-				this.complainOnUninternedIdentityComparison = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_EnablePreviews)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.enablePreviewFeatures = true;
-				if (this.targetJDK != 0)
-					this.targetJDK |= ClassFileConstants.MINOR_VERSION_PREVIEW;
-			} else if (DISABLED.equals(optionValue)) {
-				this.enablePreviewFeatures = false;
-			}
-		}
-		if ((optionValue = optionsMap.get(OPTION_ReportPreviewFeatures)) != null)
-			updateSeverity(PreviewFeatureUsed, optionValue);
-		if ((optionValue = optionsMap.get(OPTION_ReportSuppressWarningNotFullyAnalysed)) != null)
-			updateSeverity(SuppressWarningsNotAnalysed, optionValue);
-
-		if ((optionValue = optionsMap.get(OPTION_JdtDebugCompileMode)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.enableJdtDebugCompileMode = true;
-			} else if (DISABLED.equals(optionValue)) {
-				this.enableJdtDebugCompileMode = false;
-			}
-		}
-
-		if ((optionValue = optionsMap.get(OPTION_IgnoreUnnamedModuleForSplitPackage)) != null) {
-			if (ENABLED.equals(optionValue)) {
-				this.ignoreUnnamedModuleForSplitPackage = true;
-			} else if (DISABLED.equals(optionValue)) {
-				this.ignoreUnnamedModuleForSplitPackage = false;
-			}
-		}
-	}
-
-	private String[] stringToNameList(String optionValue) {
-		String[] result = optionValue.split(","); //$NON-NLS-1$
-		if (result == null)
-			return NO_STRINGS;
-		for (int i = 0; i < result.length; i++)
-			result[i] = result[i].trim();
-		return result;
-	}
-
-	String nameListToString(String[] names) {
-		if (names == null) return ""; //$NON-NLS-1$
-		return String.join(String.valueOf(','), names);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder buf = new StringBuilder("CompilerOptions:"); //$NON-NLS-1$
-		buf.append("\n\t- local variables debug attributes: ").append((this.produceDebugAttributes & ClassFileConstants.ATTR_VARS) != 0 ? "ON" : " OFF"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		buf.append("\n\t- line number debug attributes: ").append((this.produceDebugAttributes & ClassFileConstants.ATTR_LINES) != 0 ? "ON" : " OFF"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		buf.append("\n\t- source debug attributes: ").append((this.produceDebugAttributes & ClassFileConstants.ATTR_SOURCE) != 0 ? "ON" : " OFF"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		buf.append("\n\t- MethodParameters attributes: ").append(this.produceMethodParameters ? GENERATE : DO_NOT_GENERATE); //$NON-NLS-1$
-		buf.append("\n\t- Generic signature for lambda expressions: ").append(this.generateGenericSignatureForLambdaExpressions ? GENERATE : DO_NOT_GENERATE); //$NON-NLS-1$
-		buf.append("\n\t- preserve all local variables: ").append(this.preserveAllLocalVariables ? "ON" : " OFF"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		buf.append("\n\t- method with constructor name: ").append(getSeverityString(MethodWithConstructorName)); //$NON-NLS-1$
-		buf.append("\n\t- overridden package default method: ").append(getSeverityString(OverriddenPackageDefaultMethod)); //$NON-NLS-1$
-		buf.append("\n\t- deprecation: ").append(getSeverityString(UsingDeprecatedAPI)); //$NON-NLS-1$
-		buf.append("\n\t- removal: ").append(getSeverityString(UsingTerminallyDeprecatedAPI)); //$NON-NLS-1$
-		buf.append("\n\t- masked catch block: ").append(getSeverityString(MaskedCatchBlock)); //$NON-NLS-1$
-		buf.append("\n\t- unused local variable: ").append(getSeverityString(UnusedLocalVariable)); //$NON-NLS-1$
-		buf.append("\n\t- unused parameter: ").append(getSeverityString(UnusedArgument)); //$NON-NLS-1$
-		buf.append("\n\t- unused exception parameter: ").append(getSeverityString(UnusedExceptionParameter)); //$NON-NLS-1$
-		buf.append("\n\t- unused import: ").append(getSeverityString(UnusedImport)); //$NON-NLS-1$
-		buf.append("\n\t- synthetic access emulation: ").append(getSeverityString(AccessEmulation)); //$NON-NLS-1$
-		buf.append("\n\t- assignment with no effect: ").append(getSeverityString(NoEffectAssignment)); //$NON-NLS-1$
-		buf.append("\n\t- non externalized string: ").append(getSeverityString(NonExternalizedString)); //$NON-NLS-1$
-		buf.append("\n\t- static access receiver: ").append(getSeverityString(NonStaticAccessToStatic)); //$NON-NLS-1$
-		buf.append("\n\t- indirect static access: ").append(getSeverityString(IndirectStaticAccess)); //$NON-NLS-1$
-		buf.append("\n\t- incompatible non inherited interface method: ").append(getSeverityString(IncompatibleNonInheritedInterfaceMethod)); //$NON-NLS-1$
-		buf.append("\n\t- unused private member: ").append(getSeverityString(UnusedPrivateMember)); //$NON-NLS-1$
-		buf.append("\n\t- local variable hiding another variable: ").append(getSeverityString(LocalVariableHiding)); //$NON-NLS-1$
-		buf.append("\n\t- field hiding another variable: ").append(getSeverityString(FieldHiding)); //$NON-NLS-1$
-		buf.append("\n\t- type hiding another type: ").append(getSeverityString(TypeHiding)); //$NON-NLS-1$
-		buf.append("\n\t- possible accidental boolean assignment: ").append(getSeverityString(AccidentalBooleanAssign)); //$NON-NLS-1$
-		buf.append("\n\t- superfluous semicolon: ").append(getSeverityString(EmptyStatement)); //$NON-NLS-1$
-		buf.append("\n\t- uncommented empty block: ").append(getSeverityString(UndocumentedEmptyBlock)); //$NON-NLS-1$
-		buf.append("\n\t- unnecessary type check: ").append(getSeverityString(UnnecessaryTypeCheck)); //$NON-NLS-1$
-		buf.append("\n\t- javadoc comment support: ").append(this.docCommentSupport ? "ON" : " OFF"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		buf.append("\n\t\t+ invalid javadoc: ").append(getSeverityString(InvalidJavadoc)); //$NON-NLS-1$
-		buf.append("\n\t\t+ report invalid javadoc tags: ").append(this.reportInvalidJavadocTags ? ENABLED : DISABLED); //$NON-NLS-1$
-		buf.append("\n\t\t\t* deprecated references: ").append(this.reportInvalidJavadocTagsDeprecatedRef ? ENABLED : DISABLED); //$NON-NLS-1$
-		buf.append("\n\t\t\t* not visible references: ").append(this.reportInvalidJavadocTagsNotVisibleRef ? ENABLED : DISABLED); //$NON-NLS-1$
-		buf.append("\n\t\t+ visibility level to report invalid javadoc tags: ").append(getVisibilityString(this.reportInvalidJavadocTagsVisibility)); //$NON-NLS-1$
-		buf.append("\n\t\t+ missing javadoc tags: ").append(getSeverityString(MissingJavadocTags)); //$NON-NLS-1$
-		buf.append("\n\t\t+ visibility level to report missing javadoc tags: ").append(getVisibilityString(this.reportMissingJavadocTagsVisibility)); //$NON-NLS-1$
-		buf.append("\n\t\t+ report missing javadoc tags for method type parameters: ").append(this.reportMissingJavadocTagsMethodTypeParameters ? ENABLED : DISABLED); //$NON-NLS-1$
-		buf.append("\n\t\t+ report missing javadoc tags in overriding methods: ").append(this.reportMissingJavadocTagsOverriding ? ENABLED : DISABLED); //$NON-NLS-1$
-		buf.append("\n\t\t+ missing javadoc comments: ").append(getSeverityString(MissingJavadocComments)); //$NON-NLS-1$
-		buf.append("\n\t\t+ report missing tag description option: ").append(this.reportMissingJavadocTagDescription); //$NON-NLS-1$
-		buf.append("\n\t\t+ visibility level to report missing javadoc comments: ").append(getVisibilityString(this.reportMissingJavadocCommentsVisibility)); //$NON-NLS-1$
-		buf.append("\n\t\t+ report missing javadoc comments in overriding methods: ").append(this.reportMissingJavadocCommentsOverriding ? ENABLED : DISABLED); //$NON-NLS-1$
-		buf.append("\n\t- finally block not completing normally: ").append(getSeverityString(FinallyBlockNotCompleting)); //$NON-NLS-1$
-		buf.append("\n\t- report unused declared thrown exception: ").append(getSeverityString(UnusedDeclaredThrownException)); //$NON-NLS-1$
-		buf.append("\n\t- report unused declared thrown exception when overriding: ").append(this.reportUnusedDeclaredThrownExceptionWhenOverriding ? ENABLED : DISABLED); //$NON-NLS-1$
-		buf.append("\n\t- report unused declared thrown exception include doc comment reference: ").append(this.reportUnusedDeclaredThrownExceptionIncludeDocCommentReference ? ENABLED : DISABLED); //$NON-NLS-1$
-		buf.append("\n\t- report unused declared thrown exception exempt exception and throwable: ").append(this.reportUnusedDeclaredThrownExceptionExemptExceptionAndThrowable ? ENABLED : DISABLED); //$NON-NLS-1$
-		buf.append("\n\t- unnecessary else: ").append(getSeverityString(UnnecessaryElse)); //$NON-NLS-1$
-		buf.append("\n\t- JDK compliance level: "+ versionFromJdkLevel(this.complianceLevel)); //$NON-NLS-1$
-		buf.append("\n\t- JDK source level: "+ versionFromJdkLevel(this.sourceLevel)); //$NON-NLS-1$
-		buf.append("\n\t- JDK target level: "+ versionFromJdkLevel(this.targetJDK)); //$NON-NLS-1$
-		buf.append("\n\t- verbose : ").append(this.verbose ? "ON" : "OFF"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		buf.append("\n\t- produce reference info : ").append(this.produceReferenceInfo ? "ON" : "OFF"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		buf.append("\n\t- parse literal expressions as constants : ").append(this.parseLiteralExpressionsAsConstants ? "ON" : "OFF"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		buf.append("\n\t- encoding : ").append(this.defaultEncoding == null ? "<default>" : this.defaultEncoding); //$NON-NLS-1$ //$NON-NLS-2$
-		buf.append("\n\t- task tags: ").append(this.taskTags == null ? Util.EMPTY_STRING : new String(CharOperation.concatWith(this.taskTags,',')));  //$NON-NLS-1$
-		buf.append("\n\t- task priorities : ").append(this.taskPriorities == null ? Util.EMPTY_STRING : new String(CharOperation.concatWith(this.taskPriorities,','))); //$NON-NLS-1$
-		buf.append("\n\t- report deprecation inside deprecated code : ").append(this.reportDeprecationInsideDeprecatedCode ? ENABLED : DISABLED); //$NON-NLS-1$
-		buf.append("\n\t- report deprecation when overriding deprecated method : ").append(this.reportDeprecationWhenOverridingDeprecatedMethod ? ENABLED : DISABLED); //$NON-NLS-1$
-		buf.append("\n\t- report unused parameter when implementing abstract method : ").append(this.reportUnusedParameterWhenImplementingAbstract ? ENABLED : DISABLED); //$NON-NLS-1$
-		buf.append("\n\t- report unused parameter when overriding concrete method : ").append(this.reportUnusedParameterWhenOverridingConcrete ? ENABLED : DISABLED); //$NON-NLS-1$
-		buf.append("\n\t- report unused parameter include doc comment reference : ").append(this.reportUnusedParameterIncludeDocCommentReference ? ENABLED : DISABLED); //$NON-NLS-1$
-		buf.append("\n\t- report constructor/setter parameter hiding existing field : ").append(this.reportSpecialParameterHidingField ? ENABLED : DISABLED); //$NON-NLS-1$
-		buf.append("\n\t- inline JSR bytecode : ").append(this.inlineJsrBytecode ? ENABLED : DISABLED); //$NON-NLS-1$
-		buf.append("\n\t- share common finally blocks : ").append(this.shareCommonFinallyBlocks ? ENABLED : DISABLED); //$NON-NLS-1$
-		buf.append("\n\t- report unavoidable generic type problems : ").append(this.reportUnavoidableGenericTypeProblems ? ENABLED : DISABLED); //$NON-NLS-1$
-		buf.append("\n\t- unsafe type operation: ").append(getSeverityString(UncheckedTypeOperation)); //$NON-NLS-1$
-		buf.append("\n\t- unsafe raw type: ").append(getSeverityString(RawTypeReference)); //$NON-NLS-1$
-		buf.append("\n\t- final bound for type parameter: ").append(getSeverityString(FinalParameterBound)); //$NON-NLS-1$
-		buf.append("\n\t- missing serialVersionUID: ").append(getSeverityString(MissingSerialVersion)); //$NON-NLS-1$
-		buf.append("\n\t- varargs argument need cast: ").append(getSeverityString(VarargsArgumentNeedCast)); //$NON-NLS-1$
-		buf.append("\n\t- forbidden reference to type with access restriction: ").append(getSeverityString(ForbiddenReference)); //$NON-NLS-1$
-		buf.append("\n\t- discouraged reference to type with access restriction: ").append(getSeverityString(DiscouragedReference)); //$NON-NLS-1$
-		buf.append("\n\t- null reference: ").append(getSeverityString(NullReference)); //$NON-NLS-1$
-		buf.append("\n\t- potential null reference: ").append(getSeverityString(PotentialNullReference)); //$NON-NLS-1$
-		buf.append("\n\t- redundant null check: ").append(getSeverityString(RedundantNullCheck)); //$NON-NLS-1$
-		buf.append("\n\t- autoboxing: ").append(getSeverityString(AutoBoxing)); //$NON-NLS-1$
-		buf.append("\n\t- annotation super interface: ").append(getSeverityString(AnnotationSuperInterface)); //$NON-NLS-1$
-		buf.append("\n\t- missing @Override annotation: ").append(getSeverityString(MissingOverrideAnnotation)); //$NON-NLS-1$
-		buf.append("\n\t- missing @Override annotation for interface method implementation: ").append(this.reportMissingOverrideAnnotationForInterfaceMethodImplementation ? ENABLED : DISABLED); //$NON-NLS-1$
-		buf.append("\n\t- missing @Deprecated annotation: ").append(getSeverityString(MissingDeprecatedAnnotation)); //$NON-NLS-1$
-		buf.append("\n\t- incomplete enum switch: ").append(getSeverityString(MissingEnumConstantCase)); //$NON-NLS-1$
-		buf.append("\n\t- raise null related warnings for variables tainted in assert statements: ").append(this.includeNullInfoFromAsserts ? ENABLED : DISABLED); //$NON-NLS-1$
-		buf.append("\n\t- suppress warnings: ").append(this.suppressWarnings ? ENABLED : DISABLED); //$NON-NLS-1$
-		buf.append("\n\t- suppress optional errors: ").append(this.suppressOptionalErrors ? ENABLED : DISABLED); //$NON-NLS-1$
-		buf.append("\n\t- unhandled warning token: ").append(getSeverityString(UnhandledWarningToken)); //$NON-NLS-1$
-		buf.append("\n\t- unused warning token: ").append(getSeverityString(UnusedWarningToken)); //$NON-NLS-1$
-		buf.append("\n\t- unused label: ").append(getSeverityString(UnusedLabel)); //$NON-NLS-1$
-		buf.append("\n\t- treat optional error as fatal: ").append(this.treatOptionalErrorAsFatal ? ENABLED : DISABLED); //$NON-NLS-1$
-		buf.append("\n\t- parameter assignment: ").append(getSeverityString(ParameterAssignment)); //$NON-NLS-1$
-		buf.append("\n\t- generate class files: ").append(this.generateClassFiles ? ENABLED : DISABLED); //$NON-NLS-1$
-		buf.append("\n\t- process annotations: ").append(this.processAnnotations ? ENABLED : DISABLED); //$NON-NLS-1$
-		buf.append("\n\t- unused type arguments for method/constructor invocation: ").append(getSeverityString(UnusedTypeArguments)); //$NON-NLS-1$
-		buf.append("\n\t- redundant superinterface: ").append(getSeverityString(RedundantSuperinterface)); //$NON-NLS-1$
-		buf.append("\n\t- comparing identical expr: ").append(getSeverityString(ComparingIdentical)); //$NON-NLS-1$
-		buf.append("\n\t- missing synchronized on inherited method: ").append(getSeverityString(MissingSynchronizedModifierInInheritedMethod)); //$NON-NLS-1$
-		buf.append("\n\t- should implement hashCode() method: ").append(getSeverityString(ShouldImplementHashcode)); //$NON-NLS-1$
-		buf.append("\n\t- dead code: ").append(getSeverityString(DeadCode)); //$NON-NLS-1$
-		buf.append("\n\t- dead code in trivial if statement: ").append(this.reportDeadCodeInTrivialIfStatement ? ENABLED : DISABLED); //$NON-NLS-1$
-		buf.append("\n\t- tasks severity: ").append(getSeverityString(Tasks)); //$NON-NLS-1$
-		buf.append("\n\t- unused object allocation: ").append(getSeverityString(UnusedObjectAllocation)); //$NON-NLS-1$
-		buf.append("\n\t- method can be static: ").append(getSeverityString(MethodCanBeStatic)); //$NON-NLS-1$
-		buf.append("\n\t- method can be potentially static: ").append(getSeverityString(MethodCanBePotentiallyStatic)); //$NON-NLS-1$
-		buf.append("\n\t- redundant specification of type arguments: ").append(getSeverityString(RedundantSpecificationOfTypeArguments)); //$NON-NLS-1$
-		buf.append("\n\t- resource is not closed: ").append(getSeverityString(UnclosedCloseable)); //$NON-NLS-1$
-		buf.append("\n\t- resource may not be closed: ").append(getSeverityString(PotentiallyUnclosedCloseable)); //$NON-NLS-1$
-		buf.append("\n\t- resource should be handled by try-with-resources: ").append(getSeverityString(ExplicitlyClosedAutoCloseable)); //$NON-NLS-1$
-		buf.append("\n\t- Unused Type Parameter: ").append(getSeverityString(UnusedTypeParameter)); //$NON-NLS-1$
-		buf.append("\n\t- pessimistic null analysis for free type variables: ").append(getSeverityString(PessimisticNullAnalysisForFreeTypeVariables)); //$NON-NLS-1$
-		buf.append("\n\t- report unsafe nonnull return from legacy method: ").append(getSeverityString(NonNullTypeVariableFromLegacyInvocation)); //$NON-NLS-1$
-		buf.append("\n\t- unlikely argument type for collection methods: ").append(getSeverityString(UnlikelyCollectionMethodArgumentType)); //$NON-NLS-1$
-		buf.append("\n\t- unlikely argument type for collection methods, strict check against expected type: ").append(this.reportUnlikelyCollectionMethodArgumentTypeStrict ? ENABLED : DISABLED); //$NON-NLS-1$
-		buf.append("\n\t- unlikely argument types for equals(): ").append(getSeverityString(UnlikelyEqualsArgumentType)); //$NON-NLS-1$
-		buf.append("\n\t- API leak: ").append(getSeverityString(APILeak)); //$NON-NLS-1$
-		buf.append("\n\t- unstable auto module name: ").append(getSeverityString(UnstableAutoModuleName)); //$NON-NLS-1$
-		buf.append("\n\t- SuppressWarnings not fully analysed: ").append(getSeverityString(SuppressWarningsNotAnalysed)); //$NON-NLS-1$
-		buf.append("\n\t- ignore package from unnamed module: ").append(this.ignoreUnnamedModuleForSplitPackage ? ENABLED : DISABLED); //$NON-NLS-1$
-//{ObjectTeams
-		buf.append("\n\t- decapsulation : ").append(this.decapsulation); //$NON-NLS-1$
-		buf.append("\n\t- report if not exactly one basecall in callin method : ").append(getSeverityString(NotExactlyOneBasecall)); //$NON-NLS-1$
-		buf.append("\n\t- report baseclass cycle (playedBy enclosing): ").append(getSeverityString(BaseclassCycle)); //$NON-NLS-1$
-
-		buf.append("\n\t- report if callout to field has no effect : ").append(getSeverityString(EffectlessFieldaccess)); //$NON-NLS-1$
-		buf.append("\n\t- report if callin is fragile (possibly no result) : ").append(getSeverityString(FragileCallin)); //$NON-NLS-1$
-		buf.append("\n\t- report if parameter mapping is not used : ").append(getSeverityString(UnusedParammap)); //$NON-NLS-1$
-		buf.append("\n\t- report if role instantiation is unsafe : ").append(getSeverityString(UnsafeRoleInstantiation)); //$NON-NLS-1$
-
-		buf.append("\n\t- report if role-base bindings are potentially ambiguous : ").append(getSeverityString(PotentialAmbiguousPlayedBy)); //$NON-NLS-1$
-		buf.append("\n\t- report if an abstract role is potentially relevant : ").append(getSeverityString(AbstractPotentialRelevantRole)); //$NON-NLS-1$
-		buf.append("\n\t- report if binding ambiguity may cause lifting to fail in unexpected locations : ").append(getSeverityString(HiddenLiftingProblem));  //$NON-NLS-1$
-
-		buf.append("\n\t- report decapsulation (overriding of access restrictions) : ").append(getSeverityString(Decapsulation)); //$NON-NLS-1$
-		buf.append("\n\t- report decapsulation (overriding of access restrictions - field write) : ").append(getSeverityString(DecapsulationWrite)); //$NON-NLS-1$
-		buf.append("\n\t- report deprecated path syntax for externalized roles : ").append(getSeverityString(DeprecatedPathSyntax)); //$NON-NLS-1$
-
-
-		buf.append("\n\t- report violations of binding conventions : ").append(getSeverityString(BindingConventions)); //$NON-NLS-1$
-
-		buf.append("\n\t- allow and report inference for callouts : ").append(getSeverityString(AddingInferredCallout)); //$NON-NLS-1$
-
-		buf.append("\n\t- report when adapting a deprecated type/method ").append(getSeverityString(AdaptingDeprecated)); //$NON-NLS-1$
-
-		buf.append("\n\t- report if trying to bind a role to a system class: ").append(getSeverityString(WeaveIntoSystemClass)); //$NON-NLS-1$
-
-		buf.append("\n\t- report dangerous callin (hashCode or equals): ").append(getSeverityString(DangerousCallin)); //$NON-NLS-1$
-
-		buf.append("\n\t- report when overriding a final role: ").append(getSeverityString(OverridingFinalRole)); //$NON-NLS-1$
-
-		buf.append("\n\t- report if a guard throws a checked exception: ").append(getSeverityString(ExceptionInGuard)); //$NON-NLS-1$
-
-		buf.append("\n\t- report if insertion of lowering is ambiguous : ").append(getSeverityString(AmbiguousLowering)); //$NON-NLS-1$
-
-		buf.append("\n\t- allow scoped keywords : ").append(this.allowScopedKeywords ? ENABLED : DISABLED); //$NON-NLS-1$
-		buf.append("\n\t- pure java : ").append(this.isPureJava ? ENABLED : DISABLED); //$NON-NLS-1$
-// SH}
-		return buf.toString();
-	}
-
-	protected void updateSeverity(int irritant, Object severityString) {
-		if (ERROR.equals(severityString)) {
-			this.errorThreshold.set(irritant);
-			this.warningThreshold.clear(irritant);
-			this.infoThreshold.clear(irritant);
-		} else if (WARNING.equals(severityString)) {
-			this.errorThreshold.clear(irritant);
-			this.warningThreshold.set(irritant);
-			this.infoThreshold.clear(irritant);
-		} else if (INFO.equals(severityString)) {
-			this.errorThreshold.clear(irritant);
-			this.warningThreshold.clear(irritant);
-			this.infoThreshold.set(irritant);
-		} else if (IGNORE.equals(severityString)) {
-			this.errorThreshold.clear(irritant);
-			this.warningThreshold.clear(irritant);
-			this.infoThreshold.clear(irritant);
-		}
-	}
-
-	/**
-	 * Note, if you have a LookupEnvironment you should instead ask
-	 * {@link org.eclipse.jdt.internal.compiler.lookup.LookupEnvironment#usesNullTypeAnnotations()}. */
-	public boolean usesNullTypeAnnotations() {
-		if (this.useNullTypeAnnotations != null)
-			return this.useNullTypeAnnotations;
-		return this.isAnnotationBasedNullAnalysisEnabled
-				&& this.sourceLevel >=  ClassFileConstants.JDK1_8;
-	}
-}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerStats.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerStats.java
deleted file mode 100644
index 9fae8f505..000000000
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerStats.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.compiler.impl;
-
-@SuppressWarnings("rawtypes")
-public class CompilerStats implements Comparable {
-
-	// overall
-	public long startTime;
-	public long endTime;
-	public long overallTime;
-	public long lineCount;
-
-	// compile phases
-	public long parseTime;
-	public long resolveTime;
-	public long analyzeTime;
-	public long generateTime;
-
-/**
- * Returns the total elapsed time (between start and end)
- * @return the time spent between start and end
- */
-public long elapsedTime() {
-	return this.overallTime;
-}
-
-@Override
-public int compareTo(Object o) {
-	CompilerStats otherStats = (CompilerStats) o;
-	long time1 = elapsedTime();
-	long time2 = otherStats.elapsedTime();
-	return time1 < time2 ? -1 : (time1 == time2 ? 0 : 1);
-}
-}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/Constant.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/Constant.java
deleted file mode 100644
index 889ff94be..000000000
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/Constant.java
+++ /dev/null
@@ -1,1546 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.compiler.impl;
-
-import org.eclipse.jdt.internal.compiler.ast.OperatorIds;
-import org.eclipse.jdt.internal.compiler.lookup.TypeIds;
-import org.eclipse.jdt.internal.compiler.problem.ShouldNotImplement;
-import org.eclipse.jdt.internal.compiler.util.Messages;
-
-public abstract class Constant implements TypeIds, OperatorIds {
-
-	public static final Constant NotAConstant = DoubleConstant.fromValue(Double.NaN);
-	public static final Constant[] NotAConstantList = new Constant[] {DoubleConstant.fromValue(Double.NaN)};
-
-	public boolean booleanValue() {
-		throw new ShouldNotImplement(Messages.bind(Messages.constant_cannotCastedInto, new String[] { typeName(), "boolean" })); //$NON-NLS-1$
-	}
-
-	public byte byteValue() {
-		throw new ShouldNotImplement(Messages.bind(Messages.constant_cannotCastedInto, new String[] { typeName(), "byte" })); //$NON-NLS-1$
-	}
-
-	public final Constant castTo(int conversionToTargetType){
-		//the cast is an int of the form
-		// (castId<<4)+typeId (in order to follow the
-		//user written style (cast)expression ....
-
-		if (this == NotAConstant) return NotAConstant;
-		switch(conversionToTargetType){
-			case T_undefined : 						return this;
-	//            TARGET TYPE  <- FROM TYPE
-	//	    case (T_undefined<<4)+T_undefined  	 : return NotAConstant;
-	//	    case (T_undefined<<4)+T_byte  		 : return NotAConstant;
-	//	    case (T_undefined<<4)+T_long  		 : return NotAConstant;
-	//	    case (T_undefined<<4)+T_short  		 : return NotAConstant;
-	//	    case (T_undefined<<4)+T_void  		 : return NotAConstant;
-	//	    case (T_undefined<<4)+T_String  	 : return NotAConstant;
-	//	    case (T_undefined<<4)+T_Object  	 : return NotAConstant;
-	//	    case (T_undefined<<4)+T_double  	 : return NotAConstant;
-	//	    case (T_undefined<<4)+T_float  		 : return NotAConstant;
-	//	    case (T_undefined<<4)+T_boolean 	 : return NotAConstant;
-	//	    case (T_undefined<<4)+T_char  		 : return NotAConstant;
-	//	    case (T_undefined<<4)+T_int  		 : return NotAConstant;
-
-	//	    case (T_byte<<4)+T_undefined  	 : return NotAConstant;
-		    case (T_byte<<4)+T_byte  		 : return this;
-		    case (T_byte<<4)+T_long  		 : return ByteConstant.fromValue((byte)longValue());
-		    case (T_byte<<4)+T_short  		 : return ByteConstant.fromValue((byte)shortValue());
-	//	    case (T_byte<<4)+T_void  		 : return NotAConstant;
-	//	    case (T_byte<<4)+T_String  	 	 : return NotAConstant;
-	//	    case (T_byte<<4)+T_Object  	 	 : return NotAConstant;
-		    case (T_byte<<4)+T_double  	 	 : return ByteConstant.fromValue((byte)doubleValue());
-		    case (T_byte<<4)+T_float  		 : return ByteConstant.fromValue((byte)floatValue());
-	//	    case (T_byte<<4)+T_boolean  	 : return NotAConstant;
-		    case (T_byte<<4)+T_char  		 : return ByteConstant.fromValue((byte)charValue());
-		    case (T_byte<<4)+T_int  		 : return ByteConstant.fromValue((byte)intValue());
-
-	//	    case (T_long<<4)+T_undefined  	 : return NotAConstant;
-		    case (T_long<<4)+T_byte  		 : return LongConstant.fromValue(byteValue());
-		    case (T_long<<4)+T_long  		 : return this;
-		    case (T_long<<4)+T_short  		 : return LongConstant.fromValue(shortValue());
-	//	    case (T_long<<4)+T_void  		 : return NotAConstant;
-	//	    case (T_long<<4)+T_String  		 : return NotAConstant;
-	//	    case (T_long<<4)+T_Object  		 : return NotAConstant;
-		    case (T_long<<4)+T_double  		 : return LongConstant.fromValue((long)doubleValue());
-		    case (T_long<<4)+T_float  		 : return LongConstant.fromValue((long)floatValue());
-	//	    case (T_long<<4)+T_boolean  	 : return NotAConstant;
-		    case (T_long<<4)+T_char  		 : return LongConstant.fromValue(charValue());
-		    case (T_long<<4)+T_int  		 : return LongConstant.fromValue(intValue());
-
-	//	    case (T_short<<4)+T_undefined  	 : return NotAConstant;
-		    case (T_short<<4)+T_byte  		 : return ShortConstant.fromValue(byteValue());
-		    case (T_short<<4)+T_long  		 : return ShortConstant.fromValue((short)longValue());
-		    case (T_short<<4)+T_short  		 : return this;
-	//	    case (T_short<<4)+T_void  		 : return NotAConstant;
-	//	    case (T_short<<4)+T_String  	 : return NotAConstant;
-	//	    case (T_short<<4)+T_Object  	 : return NotAConstant;
-		    case (T_short<<4)+T_double  	 : return ShortConstant.fromValue((short)doubleValue());
-		    case (T_short<<4)+T_float  		 : return ShortConstant.fromValue((short)floatValue());
-	//	    case (T_short<<4)+T_boolean 	 : return NotAConstant;
-		    case (T_short<<4)+T_char  		 : return ShortConstant.fromValue((short)charValue());
-		    case (T_short<<4)+T_int  		 : return ShortConstant.fromValue((short)intValue());
-
-	//	    case (T_void<<4)+T_undefined  	 : return NotAConstant;
-	//	    case (T_void<<4)+T_byte  		 : return NotAConstant;
-	//	    case (T_void<<4)+T_long  		 : return NotAConstant;
-	//	    case (T_void<<4)+T_short  		 : return NotAConstant;
-	//	    case (T_void<<4)+T_void  		 : return NotAConstant;
-	//	    case (T_void<<4)+T_String  	 	 : return NotAConstant;
-	//	    case (T_void<<4)+T_Object  	 	 : return NotAConstant;
-	//	    case (T_void<<4)+T_double  	 	 : return NotAConstant;
-	//	    case (T_void<<4)+T_float  		 : return NotAConstant;
-	//	    case (T_void<<4)+T_boolean  	 : return NotAConstant;
-	//	    case (T_void<<4)+T_char  		 : return NotAConstant;
-	//	    case (T_void<<4)+T_int  		 : return NotAConstant;
-
-	//	    case (T_String<<4)+T_undefined   : return NotAConstant;
-	//	    case (T_String<<4)+T_byte  		 : return NotAConstant;
-	//	    case (T_String<<4)+T_long  		 : return NotAConstant;
-	//	    case (T_String<<4)+T_short  	 : return NotAConstant;
-	//	    case (T_String<<4)+T_void  		 : return NotAConstant;
-		    case (T_JavaLangString<<4)+T_JavaLangString  	 : return this;
-	//	    case (T_String<<4)+T_Object  	 : return NotAConstant;
-	//	    case (T_String<<4)+T_double  	 : return NotAConstant;
-	//	    case (T_String<<4)+T_float  	 : return NotAConstant;
-	//	    case (T_String<<4)+T_boolean 	 : return NotAConstant;
-	//	    case (T_String<<4)+T_char  		 : return NotAConstant;
-	//	    case (T_String<<4)+T_int  		 : return NotAConstant;
-
-	//	    case (T_Object<<4)+T_undefined   	: return NotAConstant;
-	//	    case (T_Object<<4)+T_byte  		 	: return NotAConstant;
-	//	    case (T_Object<<4)+T_long  		 	: return NotAConstant;
-	//	    case (T_Object<<4)+T_short 		 	: return NotAConstant;
-	//	    case (T_Object<<4)+T_void  		 	: return NotAConstant;
-	//	    case (T_Object<<4)+T_String  		: return NotAConstant;
-	//	    case (T_Object<<4)+T_Object  		: return NotAConstant;
-	//	    case (T_Object<<4)+T_double  		: return NotAConstant;
-	//	    case (T_Object<<4)+T_float  		: return NotAConstant;
-	//	    case (T_Object<<4)+T_boolean 		: return NotAConstant;
-	//	    case (T_Object<<4)+T_char  		 	: return NotAConstant;
-	//	    case (T_Object<<4)+T_int  			: return NotAConstant;
-
-	//	    case (T_double<<4)+T_undefined  	: return NotAConstant;
-		    case (T_double<<4)+T_byte  		 	: return DoubleConstant.fromValue(byteValue());
-		    case (T_double<<4)+T_long  		 	: return DoubleConstant.fromValue(longValue());
-		    case (T_double<<4)+T_short  		: return DoubleConstant.fromValue(shortValue());
-	//	    case (T_double<<4)+T_void  		 	: return NotAConstant;
-	//	    case (T_double<<4)+T_String  		: return NotAConstant;
-	//	    case (T_double<<4)+T_Object  		: return NotAConstant;
-		    case (T_double<<4)+T_double  		: return this;
-		    case (T_double<<4)+T_float  		: return DoubleConstant.fromValue(floatValue());
-	//	    case (T_double<<4)+T_boolean  		: return NotAConstant;
-		    case (T_double<<4)+T_char  		 	: return DoubleConstant.fromValue(charValue());
-		    case (T_double<<4)+T_int  			: return DoubleConstant.fromValue(intValue());
-
-	//	    case (T_float<<4)+T_undefined  	 : return NotAConstant;
-		    case (T_float<<4)+T_byte  		 : return FloatConstant.fromValue(byteValue());
-		    case (T_float<<4)+T_long  		 : return FloatConstant.fromValue(longValue());
-		    case (T_float<<4)+T_short  		 : return FloatConstant.fromValue(shortValue());
-	//	    case (T_float<<4)+T_void  		 : return NotAConstant;
-	//	    case (T_float<<4)+T_String  	 : return NotAConstant;
-	//	    case (T_float<<4)+T_Object  	 : return NotAConstant;
-		    case (T_float<<4)+T_double  	 : return FloatConstant.fromValue((float)doubleValue());
-		    case (T_float<<4)+T_float  		 : return this;
-	//	    case (T_float<<4)+T_boolean 	 : return NotAConstant;
-		    case (T_float<<4)+T_char  		 : return FloatConstant.fromValue(charValue());
-		    case (T_float<<4)+T_int  		 : return FloatConstant.fromValue(intValue());
-
-	//	    case (T_boolean<<4)+T_undefined  		 : return NotAConstant;
-	//	    case (T_boolean<<4)+T_byte  			 : return NotAConstant;
-	//	    case (T_boolean<<4)+T_long  			 : return NotAConstant;
-	//	    case (T_boolean<<4)+T_short  			 : return NotAConstant;
-	//	    case (T_boolean<<4)+T_void  			 : return NotAConstant;
-	//	    case (T_boolean<<4)+T_String  			 : return NotAConstant;
-	//	    case (T_boolean<<4)+T_Object  			 : return NotAConstant;
-	//	    case (T_boolean<<4)+T_double  			 : return NotAConstant;
-	//	    case (T_boolean<<4)+T_float  			 : return NotAConstant;
-		    case (T_boolean<<4)+T_boolean  			 : return this;
-	//	    case (T_boolean<<4)+T_char  			 : return NotAConstant;
-	//	    case (T_boolean<<4)+T_int  				 : return NotAConstant;
-
-	//	    case (T_char<<4)+T_undefined  	 : return NotAConstant;
-		    case (T_char<<4)+T_byte  		 : return CharConstant.fromValue((char)byteValue());
-		    case (T_char<<4)+T_long  		 : return CharConstant.fromValue((char)longValue());
-		    case (T_char<<4)+T_short  		 : return CharConstant.fromValue((char)shortValue());
-	//	    case (T_char<<4)+T_void  		 : return NotAConstant;
-	//	    case (T_char<<4)+T_String  		 : return NotAConstant;
-	//	    case (T_char<<4)+T_Object  		 : return NotAConstant;
-		    case (T_char<<4)+T_double  		 : return CharConstant.fromValue((char)doubleValue());
-		    case (T_char<<4)+T_float  		 : return CharConstant.fromValue((char)floatValue());
-	//	    case (T_char<<4)+T_boolean  	 : return NotAConstant;
-		    case (T_char<<4)+T_char  		 : return this;
-		    case (T_char<<4)+T_int  		 : return CharConstant.fromValue((char)intValue());
-
-	//	    case (T_int<<4)+T_undefined  	 : return NotAConstant;
-		    case (T_int<<4)+T_byte  		 : return IntConstant.fromValue(byteValue());
-		    case (T_int<<4)+T_long  		 : return IntConstant.fromValue((int) longValue());
-		    case (T_int<<4)+T_short  		 : return IntConstant.fromValue(shortValue());
-	//	    case (T_int<<4)+T_void  		 : return NotAConstant;
-	//	    case (T_int<<4)+T_String  		 : return NotAConstant;
-	//	    case (T_int<<4)+T_Object  		 : return NotAConstant;
-		    case (T_int<<4)+T_double  		 : return IntConstant.fromValue((int) doubleValue());
-		    case (T_int<<4)+T_float  		 : return IntConstant.fromValue((int) floatValue());
-	//	    case (T_int<<4)+T_boolean  	 	 : return NotAConstant;
-		    case (T_int<<4)+T_char  		 : return IntConstant.fromValue(charValue());
-		    case (T_int<<4)+T_int  		 	 : return this;
-
-		}
-		return NotAConstant;
-	}
-
-	public char charValue() {
-		throw new ShouldNotImplement(Messages.bind(Messages.constant_cannotCastedInto, new String[] { typeName(), "char" })); //$NON-NLS-1$
-	}
-
-	public static final Constant computeConstantOperation(Constant cst, int id, int operator) {
-		switch (operator) {
-			case NOT	:
-							return BooleanConstant.fromValue(!cst.booleanValue());
-			case PLUS	:
-							return computeConstantOperationPLUS(IntConstant.fromValue(0),T_int,cst,id);
-			case MINUS	:	//the two special -9223372036854775808L and -2147483648 are inlined at parseTime
-							switch (id){
-								case T_float  :	float f;
-												if ( (f= cst.floatValue()) == 0.0f)
-												{ //positive and negative 0....
-													if (Float.floatToIntBits(f) == 0)
-														return FloatConstant.fromValue(-0.0f);
-													else
-														return FloatConstant.fromValue(0.0f);}
-												break; //default case
-								case T_double : double d;
-												if ( (d= cst.doubleValue()) == 0.0d)
-												{ //positive and negative 0....
-													if (Double.doubleToLongBits(d) == 0)
-														return DoubleConstant.fromValue(-0.0d);
-													else
-														return DoubleConstant.fromValue(0.0d);}
-												break; //default case
-							}
-							return computeConstantOperationMINUS(IntConstant.fromValue(0),T_int,cst,id);
-			case TWIDDLE:
-				switch (id){
-					case T_char :	return IntConstant.fromValue(~ cst.charValue());
-					case T_byte:	return IntConstant.fromValue(~ cst.byteValue());
-					case T_short:	return IntConstant.fromValue(~ cst.shortValue());
-					case T_int:		return IntConstant.fromValue(~ cst.intValue());
-					case T_long:	return LongConstant.fromValue(~ cst.longValue());
-					default : return NotAConstant;
-				}
-			default : return NotAConstant;
-		}
-	}
-
-	public static final Constant computeConstantOperation(Constant left, int leftId, int operator, Constant right, int rightId) {
-		switch (operator) {
-			case AND		: return computeConstantOperationAND		(left,leftId,right,rightId);
-			case AND_AND	: return computeConstantOperationAND_AND	(left,leftId,right,rightId);
-			case DIVIDE 	: return computeConstantOperationDIVIDE		(left,leftId,right,rightId);
-			case GREATER	: return computeConstantOperationGREATER	(left,leftId,right,rightId);
-			case GREATER_EQUAL	: return computeConstantOperationGREATER_EQUAL(left,leftId,right,rightId);
-			case LEFT_SHIFT	: return computeConstantOperationLEFT_SHIFT	(left,leftId,right,rightId);
-			case LESS		: return computeConstantOperationLESS		(left,leftId,right,rightId);
-			case LESS_EQUAL	: return computeConstantOperationLESS_EQUAL	(left,leftId,right,rightId);
-			case MINUS		: return computeConstantOperationMINUS		(left,leftId,right,rightId);
-			case MULTIPLY	: return computeConstantOperationMULTIPLY	(left,leftId,right,rightId);
-			case OR			: return computeConstantOperationOR			(left,leftId,right,rightId);
-			case OR_OR		: return computeConstantOperationOR_OR		(left,leftId,right,rightId);
-			case PLUS		: return computeConstantOperationPLUS		(left,leftId,right,rightId);
-			case REMAINDER	: return computeConstantOperationREMAINDER	(left,leftId,right,rightId);
-			case RIGHT_SHIFT: return computeConstantOperationRIGHT_SHIFT(left,leftId,right,rightId);
-			case UNSIGNED_RIGHT_SHIFT: return computeConstantOperationUNSIGNED_RIGHT_SHIFT(left,leftId,right,rightId);
-			case XOR		: return computeConstantOperationXOR		(left,leftId,right,rightId);
-			default : return NotAConstant;
-		}
-	}
-
-	public static final Constant computeConstantOperationAND(Constant left, int leftId, Constant right, int rightId) {
-		switch (leftId){
-			case T_boolean :		return BooleanConstant.fromValue(left.booleanValue() & right.booleanValue());
-			case T_char :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.charValue() & right.charValue());
-					case T_byte:	return IntConstant.fromValue(left.charValue() & right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.charValue() & right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.charValue() & right.intValue());
-					case T_long:	return LongConstant.fromValue(left.charValue() & right.longValue());
-				}
-				break;
-			case T_byte :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.byteValue() & right.charValue());
-					case T_byte:	return IntConstant.fromValue(left.byteValue() & right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.byteValue() & right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.byteValue() & right.intValue());
-					case T_long:	return LongConstant.fromValue(left.byteValue() & right.longValue());
-				}
-				break;
-			case T_short :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.shortValue() & right.charValue());
-					case T_byte:	return IntConstant.fromValue(left.shortValue() & right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.shortValue() & right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.shortValue() & right.intValue());
-					case T_long:	return LongConstant.fromValue(left.shortValue() & right.longValue());
-				}
-				break;
-			case T_int :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.intValue() & right.charValue());
-					case T_byte:	return IntConstant.fromValue(left.intValue() & right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.intValue() & right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.intValue() & right.intValue());
-					case T_long:	return LongConstant.fromValue(left.intValue() & right.longValue());
-				}
-				break;
-			case T_long :
-				switch (rightId){
-					case T_char :	return LongConstant.fromValue(left.longValue() & right.charValue());
-					case T_byte:	return LongConstant.fromValue(left.longValue() & right.byteValue());
-					case T_short:	return LongConstant.fromValue(left.longValue() & right.shortValue());
-					case T_int:		return LongConstant.fromValue(left.longValue() & right.intValue());
-					case T_long:	return LongConstant.fromValue(left.longValue() & right.longValue());
-				}
-		}
-		return NotAConstant;
-	}
-
-	public static final Constant computeConstantOperationAND_AND(Constant left, int leftId, Constant right, int rightId) {
-		return BooleanConstant.fromValue(left.booleanValue() && right.booleanValue());
-	}
-
-	public static final Constant computeConstantOperationDIVIDE(Constant left, int leftId, Constant right, int rightId) {
-		// division by zero must be handled outside this method (error reporting)
-		switch (leftId){
-			case T_char :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.charValue() / right.charValue());
-					case T_float:	return FloatConstant.fromValue(left.charValue() / right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.charValue() / right.doubleValue());
-					case T_byte:	return IntConstant.fromValue(left.charValue() / right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.charValue() / right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.charValue() / right.intValue());
-					case T_long:	return LongConstant.fromValue(left.charValue() / right.longValue());
-				}
-				break;
-			case T_float :
-				switch (rightId){
-					case T_char :	return FloatConstant.fromValue(left.floatValue() / right.charValue());
-					case T_float:	return FloatConstant.fromValue(left.floatValue() / right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.floatValue() / right.doubleValue());
-					case T_byte:	return FloatConstant.fromValue(left.floatValue() / right.byteValue());
-					case T_short:	return FloatConstant.fromValue(left.floatValue() / right.shortValue());
-					case T_int:		return FloatConstant.fromValue(left.floatValue() / right.intValue());
-					case T_long:	return FloatConstant.fromValue(left.floatValue() / right.longValue());
-				}
-				break;
-			case T_double :
-				switch (rightId){
-					case T_char :	return DoubleConstant.fromValue(left.doubleValue() / right.charValue());
-					case T_float:	return DoubleConstant.fromValue(left.doubleValue() / right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.doubleValue() / right.doubleValue());
-					case T_byte:	return DoubleConstant.fromValue(left.doubleValue() / right.byteValue());
-					case T_short:	return DoubleConstant.fromValue(left.doubleValue() / right.shortValue());
-					case T_int:		return DoubleConstant.fromValue(left.doubleValue() / right.intValue());
-					case T_long:	return DoubleConstant.fromValue(left.doubleValue() / right.longValue());
-				}
-				break;
-			case T_byte :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.byteValue() / right.charValue());
-					case T_float:	return FloatConstant.fromValue(left.byteValue() / right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.byteValue() / right.doubleValue());
-					case T_byte:	return IntConstant.fromValue(left.byteValue() / right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.byteValue() / right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.byteValue() / right.intValue());
-					case T_long:	return LongConstant.fromValue(left.byteValue() / right.longValue());
-				}
-				break;
-			case T_short :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.shortValue() / right.charValue());
-					case T_float:	return FloatConstant.fromValue(left.shortValue() / right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.shortValue() / right.doubleValue());
-					case T_byte:	return IntConstant.fromValue(left.shortValue() / right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.shortValue() / right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.shortValue() / right.intValue());
-					case T_long:	return LongConstant.fromValue(left.shortValue() / right.longValue());
-				}
-				break;
-			case T_int :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.intValue() / right.charValue());
-					case T_float:	return FloatConstant.fromValue(left.intValue() / right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.intValue() / right.doubleValue());
-					case T_byte:	return IntConstant.fromValue(left.intValue() / right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.intValue() / right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.intValue() / right.intValue());
-					case T_long:	return LongConstant.fromValue(left.intValue() / right.longValue());
-				}
-				break;
-			case T_long :
-				switch (rightId){
-					case T_char :	return LongConstant.fromValue(left.longValue() / right.charValue());
-					case T_float:	return FloatConstant.fromValue(left.longValue() / right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.longValue() / right.doubleValue());
-					case T_byte:	return LongConstant.fromValue(left.longValue() / right.byteValue());
-					case T_short:	return LongConstant.fromValue(left.longValue() / right.shortValue());
-					case T_int:		return LongConstant.fromValue(left.longValue() / right.intValue());
-					case T_long:	return LongConstant.fromValue(left.longValue() / right.longValue());
-				}
-		}
-		return NotAConstant;
-	}
-
-	public static final Constant computeConstantOperationEQUAL_EQUAL(Constant left, int leftId, Constant right, int rightId) {
-		switch (leftId){
-			case T_boolean :
-				if (rightId == T_boolean) {
-					return BooleanConstant.fromValue(left.booleanValue() == right.booleanValue());
-				}
-				break;
-			case T_char :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.charValue() == right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.charValue() == right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.charValue() == right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.charValue() == right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.charValue() == right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.charValue() == right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.charValue() == right.longValue());}
-				break;
-			case T_float :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.floatValue() == right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.floatValue() == right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.floatValue() == right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.floatValue() == right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.floatValue() == right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.floatValue() == right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.floatValue() == right.longValue());
-				}
-				break;
-			case T_double :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.doubleValue() == right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.doubleValue() == right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.doubleValue() == right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.doubleValue() == right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.doubleValue() == right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.doubleValue() == right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.doubleValue() == right.longValue());
-				}
-				break;
-			case T_byte :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.byteValue() == right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.byteValue() == right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.byteValue() == right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.byteValue() == right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.byteValue() == right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.byteValue() == right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.byteValue() == right.longValue());
-				}
-				break;
-			case T_short :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.shortValue() == right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.shortValue() == right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.shortValue() == right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.shortValue() == right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.shortValue() == right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.shortValue() == right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.shortValue() == right.longValue());
-				}
-				break;
-			case T_int :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.intValue() == right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.intValue() == right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.intValue() == right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.intValue() == right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.intValue() == right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.intValue() == right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.intValue() == right.longValue());
-				}
-				break;
-			case T_long :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.longValue() == right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.longValue() == right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.longValue() == right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.longValue() == right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.longValue() == right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.longValue() == right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.longValue() == right.longValue());
-				}
-				break;
-			case T_JavaLangString :
-				if (rightId == T_JavaLangString) {
-					//String are interned in th compiler==>thus if two string constant
-					//get to be compared, it is an equal on the vale which is done
-					return BooleanConstant.fromValue(((StringConstant)left).hasSameValue(right));
-				}
-				break;
-			case T_null :
-				if (rightId == T_JavaLangString) {
-					return BooleanConstant.fromValue(false);
-				} else {
-					if (rightId == T_null) {
-						return BooleanConstant.fromValue(true);
-					}
-				}
-		}
-		return BooleanConstant.fromValue(false);
-	}
-
-	public static final Constant computeConstantOperationGREATER(Constant left, int leftId, Constant right, int rightId) {
-		switch (leftId){
-			case T_char :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.charValue() > right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.charValue() > right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.charValue() > right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.charValue() > right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.charValue() > right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.charValue() > right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.charValue() > right.longValue());
-				}
-				break;
-			case T_float :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.floatValue() > right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.floatValue() > right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.floatValue() > right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.floatValue() > right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.floatValue() > right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.floatValue() > right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.floatValue() > right.longValue());
-				}
-				break;
-			case T_double :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.doubleValue() > right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.doubleValue() > right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.doubleValue() > right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.doubleValue() > right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.doubleValue() > right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.doubleValue() > right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.doubleValue() > right.longValue());
-				}
-				break;
-			case T_byte :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.byteValue() > right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.byteValue() > right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.byteValue() > right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.byteValue() > right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.byteValue() > right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.byteValue() > right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.byteValue() > right.longValue());
-				}
-				break;
-			case T_short :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.shortValue() > right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.shortValue() > right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.shortValue() > right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.shortValue() > right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.shortValue() > right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.shortValue() > right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.shortValue() > right.longValue());
-				}
-				break;
-			case T_int :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.intValue() > right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.intValue() > right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.intValue() > right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.intValue() > right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.intValue() > right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.intValue() > right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.intValue() > right.longValue());
-				}
-				break;
-			case T_long :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.longValue() > right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.longValue() > right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.longValue() > right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.longValue() > right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.longValue() > right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.longValue() > right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.longValue() > right.longValue());
-				}
-
-		}
-		return NotAConstant;
-	}
-
-	public static final Constant computeConstantOperationGREATER_EQUAL(Constant left, int leftId, Constant right, int rightId) {
-		switch (leftId){
-			case T_char :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.charValue() >= right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.charValue() >= right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.charValue() >= right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.charValue() >= right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.charValue() >= right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.charValue() >= right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.charValue() >= right.longValue());
-				}
-				break;
-			case T_float :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.floatValue() >= right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.floatValue() >= right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.floatValue() >= right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.floatValue() >= right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.floatValue() >= right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.floatValue() >= right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.floatValue() >= right.longValue());
-				}
-				break;
-			case T_double :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.doubleValue() >= right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.doubleValue() >= right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.doubleValue() >= right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.doubleValue() >= right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.doubleValue() >= right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.doubleValue() >= right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.doubleValue() >= right.longValue());
-				}
-				break;
-			case T_byte :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.byteValue() >= right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.byteValue() >= right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.byteValue() >= right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.byteValue() >= right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.byteValue() >= right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.byteValue() >= right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.byteValue() >= right.longValue());
-				}
-				break;
-			case T_short :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.shortValue() >= right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.shortValue() >= right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.shortValue() >= right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.shortValue() >= right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.shortValue() >= right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.shortValue() >= right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.shortValue() >= right.longValue());
-				}
-				break;
-			case T_int :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.intValue() >= right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.intValue() >= right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.intValue() >= right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.intValue() >= right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.intValue() >= right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.intValue() >= right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.intValue() >= right.longValue());
-				}
-				break;
-			case T_long :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.longValue() >= right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.longValue() >= right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.longValue() >= right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.longValue() >= right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.longValue() >= right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.longValue() >= right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.longValue() >= right.longValue());
-				}
-		}
-		return NotAConstant;
-	}
-
-	public static final Constant computeConstantOperationLEFT_SHIFT(Constant left, int leftId, Constant right, int rightId) {
-		switch (leftId){
-			case T_char :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.charValue() << right.charValue());
-					case T_byte:	return IntConstant.fromValue(left.charValue() << right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.charValue() << right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.charValue() << right.intValue());
-					case T_long:	return IntConstant.fromValue(left.charValue() << right.longValue());
-				}
-				break;
-			case T_byte :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.byteValue() << right.charValue());
-					case T_byte:	return IntConstant.fromValue(left.byteValue() << right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.byteValue() << right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.byteValue() << right.intValue());
-					case T_long:	return IntConstant.fromValue(left.byteValue() << right.longValue());
-				}
-				break;
-			case T_short :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.shortValue() << right.charValue());
-					case T_byte:	return IntConstant.fromValue(left.shortValue() << right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.shortValue() << right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.shortValue() << right.intValue());
-					case T_long:	return IntConstant.fromValue(left.shortValue() << right.longValue());
-				}
-				break;
-			case T_int :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.intValue() << right.charValue());
-					case T_byte:	return IntConstant.fromValue(left.intValue() << right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.intValue() << right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.intValue() << right.intValue());
-					case T_long:	return IntConstant.fromValue(left.intValue() << right.longValue());
-				}
-				break;
-			case T_long :
-				switch (rightId){
-					case T_char :	return LongConstant.fromValue(left.longValue() << right.charValue());
-					case T_byte:	return LongConstant.fromValue(left.longValue() << right.byteValue());
-					case T_short:	return LongConstant.fromValue(left.longValue() << right.shortValue());
-					case T_int:		return LongConstant.fromValue(left.longValue() << right.intValue());
-					case T_long:	return LongConstant.fromValue(left.longValue() << right.longValue());
-				}
-		}
-		return NotAConstant;
-	}
-
-	public static final Constant computeConstantOperationLESS(Constant left, int leftId, Constant right, int rightId) {
-		switch (leftId){
-			case T_char :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.charValue() < right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.charValue() < right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.charValue() < right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.charValue() < right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.charValue() < right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.charValue() < right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.charValue() < right.longValue());
-				}
-				break;
-			case T_float :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.floatValue() < right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.floatValue() < right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.floatValue() < right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.floatValue() < right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.floatValue() < right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.floatValue() < right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.floatValue() < right.longValue());
-				}
-				break;
-			case T_double :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.doubleValue() < right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.doubleValue() < right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.doubleValue() < right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.doubleValue() < right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.doubleValue() < right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.doubleValue() < right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.doubleValue() < right.longValue());
-				}
-				break;
-			case T_byte :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.byteValue() < right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.byteValue() < right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.byteValue() < right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.byteValue() < right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.byteValue() < right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.byteValue() < right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.byteValue() < right.longValue());
-				}
-				break;
-			case T_short :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.shortValue() < right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.shortValue() < right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.shortValue() < right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.shortValue() < right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.shortValue() < right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.shortValue() < right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.shortValue() < right.longValue());
-				}
-				break;
-			case T_int :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.intValue() < right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.intValue() < right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.intValue() < right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.intValue() < right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.intValue() < right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.intValue() < right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.intValue() < right.longValue());
-				}
-				break;
-			case T_long :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.longValue() < right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.longValue() < right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.longValue() < right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.longValue() < right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.longValue() < right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.longValue() < right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.longValue() < right.longValue());
-				}
-		}
-		return NotAConstant;
-	}
-
-	public static final Constant computeConstantOperationLESS_EQUAL(Constant left, int leftId, Constant right, int rightId) {
-		switch (leftId){
-			case T_char :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.charValue() <= right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.charValue() <= right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.charValue() <= right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.charValue() <= right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.charValue() <= right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.charValue() <= right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.charValue() <= right.longValue());
-				}
-				break;
-			case T_float :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.floatValue() <= right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.floatValue() <= right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.floatValue() <= right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.floatValue() <= right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.floatValue() <= right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.floatValue() <= right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.floatValue() <= right.longValue());
-				}
-				break;
-			case T_double :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.doubleValue() <= right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.doubleValue() <= right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.doubleValue() <= right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.doubleValue() <= right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.doubleValue() <= right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.doubleValue() <= right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.doubleValue() <= right.longValue());
-				}
-				break;
-			case T_byte :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.byteValue() <= right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.byteValue() <= right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.byteValue() <= right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.byteValue() <= right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.byteValue() <= right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.byteValue() <= right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.byteValue() <= right.longValue());
-				}
-				break;
-			case T_short :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.shortValue() <= right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.shortValue() <= right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.shortValue() <= right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.shortValue() <= right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.shortValue() <= right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.shortValue() <= right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.shortValue() <= right.longValue());
-				}
-			break;
-			case T_int :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.intValue() <= right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.intValue() <= right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.intValue() <= right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.intValue() <= right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.intValue() <= right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.intValue() <= right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.intValue() <= right.longValue());
-				}
-				break;
-			case T_long :
-				switch (rightId){
-					case T_char :	return BooleanConstant.fromValue(left.longValue() <= right.charValue());
-					case T_float:	return BooleanConstant.fromValue(left.longValue() <= right.floatValue());
-					case T_double:	return BooleanConstant.fromValue(left.longValue() <= right.doubleValue());
-					case T_byte:	return BooleanConstant.fromValue(left.longValue() <= right.byteValue());
-					case T_short:	return BooleanConstant.fromValue(left.longValue() <= right.shortValue());
-					case T_int:		return BooleanConstant.fromValue(left.longValue() <= right.intValue());
-					case T_long:	return BooleanConstant.fromValue(left.longValue() <= right.longValue());
-				}
-		}
-		return NotAConstant;
-	}
-
-	public static final Constant computeConstantOperationMINUS(Constant left, int leftId, Constant right, int rightId) {
-		switch (leftId){
-			case T_char :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.charValue() - right.charValue());
-					case T_float:	return FloatConstant.fromValue(left.charValue() - right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.charValue() - right.doubleValue());
-					case T_byte:	return IntConstant.fromValue(left.charValue() - right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.charValue() - right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.charValue() - right.intValue());
-					case T_long:	return LongConstant.fromValue(left.charValue() - right.longValue());
-				}
-				break;
-			case T_float :
-				switch (rightId){
-					case T_char :	return FloatConstant.fromValue(left.floatValue() - right.charValue());
-					case T_float:	return FloatConstant.fromValue(left.floatValue() - right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.floatValue() - right.doubleValue());
-					case T_byte:	return FloatConstant.fromValue(left.floatValue() - right.byteValue());
-					case T_short:	return FloatConstant.fromValue(left.floatValue() - right.shortValue());
-					case T_int:		return FloatConstant.fromValue(left.floatValue() - right.intValue());
-					case T_long:	return FloatConstant.fromValue(left.floatValue() - right.longValue());
-				}
-				break;
-			case T_double :
-				switch (rightId){
-					case T_char :	return DoubleConstant.fromValue(left.doubleValue() - right.charValue());
-					case T_float:	return DoubleConstant.fromValue(left.doubleValue() - right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.doubleValue() - right.doubleValue());
-					case T_byte:	return DoubleConstant.fromValue(left.doubleValue() - right.byteValue());
-					case T_short:	return DoubleConstant.fromValue(left.doubleValue() - right.shortValue());
-					case T_int:		return DoubleConstant.fromValue(left.doubleValue() - right.intValue());
-					case T_long:	return DoubleConstant.fromValue(left.doubleValue() - right.longValue());
-				}
-				break;
-			case T_byte :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.byteValue() - right.charValue());
-					case T_float:	return FloatConstant.fromValue(left.byteValue() - right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.byteValue() - right.doubleValue());
-					case T_byte:	return IntConstant.fromValue(left.byteValue() - right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.byteValue() - right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.byteValue() - right.intValue());
-					case T_long:	return LongConstant.fromValue(left.byteValue() - right.longValue());
-				}
-				break;
-			case T_short :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.shortValue() - right.charValue());
-					case T_float:	return FloatConstant.fromValue(left.shortValue() - right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.shortValue() - right.doubleValue());
-					case T_byte:	return IntConstant.fromValue(left.shortValue() - right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.shortValue() - right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.shortValue() - right.intValue());
-					case T_long:	return LongConstant.fromValue(left.shortValue() - right.longValue());
-				}
-				break;
-			case T_int :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.intValue() - right.charValue());
-					case T_float:	return FloatConstant.fromValue(left.intValue() - right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.intValue() - right.doubleValue());
-					case T_byte:	return IntConstant.fromValue(left.intValue() - right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.intValue() - right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.intValue() - right.intValue());
-					case T_long:	return LongConstant.fromValue(left.intValue() - right.longValue());
-				}
-				break;
-			case T_long :
-				switch (rightId){
-					case T_char :	return LongConstant.fromValue(left.longValue() - right.charValue());
-					case T_float:	return FloatConstant.fromValue(left.longValue() - right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.longValue() - right.doubleValue());
-					case T_byte:	return LongConstant.fromValue(left.longValue() - right.byteValue());
-					case T_short:	return LongConstant.fromValue(left.longValue() - right.shortValue());
-					case T_int:		return LongConstant.fromValue(left.longValue() - right.intValue());
-					case T_long:	return LongConstant.fromValue(left.longValue() - right.longValue());
-				}
-		}
-		return NotAConstant;
-	}
-
-	public static final Constant computeConstantOperationMULTIPLY(Constant left, int leftId, Constant right, int rightId) {
-		switch (leftId){
-			case T_char :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.charValue() * right.charValue());
-					case T_float:	return FloatConstant.fromValue(left.charValue() * right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.charValue() * right.doubleValue());
-					case T_byte:	return IntConstant.fromValue(left.charValue() * right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.charValue() * right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.charValue() * right.intValue());
-					case T_long:	return LongConstant.fromValue(left.charValue() * right.longValue());
-				}
-				break;
-			case T_float :
-				switch (rightId){
-					case T_char :	return FloatConstant.fromValue(left.floatValue() * right.charValue());
-					case T_float:	return FloatConstant.fromValue(left.floatValue() * right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.floatValue() * right.doubleValue());
-					case T_byte:	return FloatConstant.fromValue(left.floatValue() * right.byteValue());
-					case T_short:	return FloatConstant.fromValue(left.floatValue() * right.shortValue());
-					case T_int:		return FloatConstant.fromValue(left.floatValue() * right.intValue());
-					case T_long:	return FloatConstant.fromValue(left.floatValue() * right.longValue());
-				}
-				break;
-			case T_double :
-				switch (rightId){
-					case T_char :	return DoubleConstant.fromValue(left.doubleValue() * right.charValue());
-					case T_float:	return DoubleConstant.fromValue(left.doubleValue() * right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.doubleValue() * right.doubleValue());
-					case T_byte:	return DoubleConstant.fromValue(left.doubleValue() * right.byteValue());
-					case T_short:	return DoubleConstant.fromValue(left.doubleValue() * right.shortValue());
-					case T_int:		return DoubleConstant.fromValue(left.doubleValue() * right.intValue());
-					case T_long:	return DoubleConstant.fromValue(left.doubleValue() * right.longValue());
-				}
-				break;
-			case T_byte :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.byteValue() * right.charValue());
-					case T_float:	return FloatConstant.fromValue(left.byteValue() * right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.byteValue() * right.doubleValue());
-					case T_byte:	return IntConstant.fromValue(left.byteValue() * right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.byteValue() * right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.byteValue() * right.intValue());
-					case T_long:	return LongConstant.fromValue(left.byteValue() * right.longValue());
-				}
-				break;
-			case T_short :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.shortValue() * right.charValue());
-					case T_float:	return FloatConstant.fromValue(left.shortValue() * right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.shortValue() * right.doubleValue());
-					case T_byte:	return IntConstant.fromValue(left.shortValue() * right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.shortValue() * right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.shortValue() * right.intValue());
-					case T_long:	return LongConstant.fromValue(left.shortValue() * right.longValue());
-				}
-				break;
-			case T_int :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.intValue() * right.charValue());
-					case T_float:	return FloatConstant.fromValue(left.intValue() * right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.intValue() * right.doubleValue());
-					case T_byte:	return IntConstant.fromValue(left.intValue() * right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.intValue() * right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.intValue() * right.intValue());
-					case T_long:	return LongConstant.fromValue(left.intValue() * right.longValue());
-				}
-				break;
-			case T_long :
-				switch (rightId){
-					case T_char :	return LongConstant.fromValue(left.longValue() * right.charValue());
-					case T_float:	return FloatConstant.fromValue(left.longValue() * right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.longValue() * right.doubleValue());
-					case T_byte:	return LongConstant.fromValue(left.longValue() * right.byteValue());
-					case T_short:	return LongConstant.fromValue(left.longValue() * right.shortValue());
-					case T_int:		return LongConstant.fromValue(left.longValue() * right.intValue());
-					case T_long:	return LongConstant.fromValue(left.longValue() * right.longValue());
-				}
-		}
-		return NotAConstant;
-	}
-
-	public static final Constant computeConstantOperationOR(Constant left, int leftId, Constant right, int rightId) {
-		switch (leftId){
-			case T_boolean :		return BooleanConstant.fromValue(left.booleanValue() | right.booleanValue());
-			case T_char :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.charValue() | right.charValue());
-					case T_byte:	return IntConstant.fromValue(left.charValue() | right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.charValue() | right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.charValue() | right.intValue());
-					case T_long:	return LongConstant.fromValue(left.charValue() | right.longValue());
-				}
-				break;
-			case T_byte :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.byteValue() | right.charValue());
-					case T_byte:	return IntConstant.fromValue(left.byteValue() | right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.byteValue() | right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.byteValue() | right.intValue());
-					case T_long:	return LongConstant.fromValue(left.byteValue() | right.longValue());
-				}
-				break;
-			case T_short :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.shortValue() | right.charValue());
-					case T_byte:	return IntConstant.fromValue(left.shortValue() | right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.shortValue() | right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.shortValue() | right.intValue());
-					case T_long:	return LongConstant.fromValue(left.shortValue() | right.longValue());
-				}
-				break;
-			case T_int :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.intValue() | right.charValue());
-					case T_byte:	return IntConstant.fromValue(left.intValue() | right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.intValue() | right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.intValue() | right.intValue());
-					case T_long:	return LongConstant.fromValue(left.intValue() | right.longValue());
-				}
-				break;
-			case T_long :
-				switch (rightId){
-					case T_char :	return LongConstant.fromValue(left.longValue() | right.charValue());
-					case T_byte:	return LongConstant.fromValue(left.longValue() | right.byteValue());
-					case T_short:	return LongConstant.fromValue(left.longValue() | right.shortValue());
-					case T_int:		return LongConstant.fromValue(left.longValue() | right.intValue());
-					case T_long:	return LongConstant.fromValue(left.longValue() | right.longValue());
-				}
-		}
-		return NotAConstant;
-	}
-
-	public static final Constant computeConstantOperationOR_OR(Constant left, int leftId, Constant right, int rightId) {
-		return BooleanConstant.fromValue(left.booleanValue() || right.booleanValue());
-	}
-
-	public static final Constant computeConstantOperationPLUS(Constant left, int leftId, Constant right, int rightId) {
-		switch (leftId){
-			case T_JavaLangObject :
-				if (rightId == T_JavaLangString) {
-					return StringConstant.fromValue(left.stringValue() + right.stringValue());
-				}
-				break;
-			case T_boolean :
-				if (rightId == T_JavaLangString) {
-					return StringConstant.fromValue(left.stringValue() + right.stringValue());
-				}
-				break;
-			case T_char :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.charValue() + right.charValue());
-					case T_float:	return FloatConstant.fromValue(left.charValue() + right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.charValue() + right.doubleValue());
-					case T_byte:	return IntConstant.fromValue(left.charValue() + right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.charValue() + right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.charValue() + right.intValue());
-					case T_long:	return LongConstant.fromValue(left.charValue() + right.longValue());
-					case T_JavaLangString:	return StringConstant.fromValue(left.stringValue() + right.stringValue());
-				}
-				break;
-			case T_float :
-				switch (rightId){
-					case T_char :	return FloatConstant.fromValue(left.floatValue() + right.charValue());
-					case T_float:	return FloatConstant.fromValue(left.floatValue() + right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.floatValue() + right.doubleValue());
-					case T_byte:	return FloatConstant.fromValue(left.floatValue() + right.byteValue());
-					case T_short:	return FloatConstant.fromValue(left.floatValue() + right.shortValue());
-					case T_int:		return FloatConstant.fromValue(left.floatValue() + right.intValue());
-					case T_long:	return FloatConstant.fromValue(left.floatValue() + right.longValue());
-					case T_JavaLangString:	return StringConstant.fromValue(left.stringValue() + right.stringValue());
-				}
-				break;
-			case T_double :
-				switch (rightId){
-					case T_char :	return DoubleConstant.fromValue(left.doubleValue() + right.charValue());
-					case T_float:	return DoubleConstant.fromValue(left.doubleValue() + right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.doubleValue() + right.doubleValue());
-					case T_byte:	return DoubleConstant.fromValue(left.doubleValue() + right.byteValue());
-					case T_short:	return DoubleConstant.fromValue(left.doubleValue() + right.shortValue());
-					case T_int:		return DoubleConstant.fromValue(left.doubleValue() + right.intValue());
-					case T_long:	return DoubleConstant.fromValue(left.doubleValue() + right.longValue());
-					case T_JavaLangString:	return StringConstant.fromValue(left.stringValue() + right.stringValue());
-				}
-				break;
-			case T_byte :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.byteValue() + right.charValue());
-					case T_float:	return FloatConstant.fromValue(left.byteValue() + right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.byteValue() + right.doubleValue());
-					case T_byte:	return IntConstant.fromValue(left.byteValue() + right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.byteValue() + right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.byteValue() + right.intValue());
-					case T_long:	return LongConstant.fromValue(left.byteValue() + right.longValue());
-					case T_JavaLangString:	return StringConstant.fromValue(left.stringValue() + right.stringValue());
-				}
-				break;
-			case T_short :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.shortValue() + right.charValue());
-					case T_float:	return FloatConstant.fromValue(left.shortValue() + right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.shortValue() + right.doubleValue());
-					case T_byte:	return IntConstant.fromValue(left.shortValue() + right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.shortValue() + right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.shortValue() + right.intValue());
-					case T_long:	return LongConstant.fromValue(left.shortValue() + right.longValue());
-					case T_JavaLangString:	return StringConstant.fromValue(left.stringValue() + right.stringValue());
-				}
-				break;
-			case T_int :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.intValue() + right.charValue());
-					case T_float:	return FloatConstant.fromValue(left.intValue() + right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.intValue() + right.doubleValue());
-					case T_byte:	return IntConstant.fromValue(left.intValue() + right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.intValue() + right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.intValue() + right.intValue());
-					case T_long:	return LongConstant.fromValue(left.intValue() + right.longValue());
-					case T_JavaLangString:	return StringConstant.fromValue(left.stringValue() + right.stringValue());
-				}
-				break;
-			case T_long :
-				switch (rightId){
-					case T_char :	return LongConstant.fromValue(left.longValue() + right.charValue());
-					case T_float:	return FloatConstant.fromValue(left.longValue() + right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.longValue() + right.doubleValue());
-					case T_byte:	return LongConstant.fromValue(left.longValue() + right.byteValue());
-					case T_short:	return LongConstant.fromValue(left.longValue() + right.shortValue());
-					case T_int:		return LongConstant.fromValue(left.longValue() + right.intValue());
-					case T_long:	return LongConstant.fromValue(left.longValue() + right.longValue());
-					case T_JavaLangString:	return StringConstant.fromValue(left.stringValue() + right.stringValue());
-				}
-				break;
-			case T_JavaLangString :
-				switch (rightId){
-					case T_char :	return StringConstant.fromValue(left.stringValue() + String.valueOf(right.charValue()));
-					case T_float:	return StringConstant.fromValue(left.stringValue() + String.valueOf(right.floatValue()));
-					case T_double:	return StringConstant.fromValue(left.stringValue() + String.valueOf(right.doubleValue()));
-					case T_byte:	return StringConstant.fromValue(left.stringValue() + String.valueOf(right.byteValue()));
-					case T_short:	return StringConstant.fromValue(left.stringValue() + String.valueOf(right.shortValue()));
-					case T_int:		return StringConstant.fromValue(left.stringValue() + String.valueOf(right.intValue()));
-					case T_long:	return StringConstant.fromValue(left.stringValue() + String.valueOf(right.longValue()));
-					case T_JavaLangString:	return StringConstant.fromValue(left.stringValue() + right.stringValue());
-					case T_boolean:	return StringConstant.fromValue(left.stringValue() + right.booleanValue());
-				}
-				break;
-//			case T_null :
-//				switch (rightId){
-//					case T_char :	return Constant.fromValue(left.stringValue() + String.valueOf(right.charValue()));
-//					case T_float:	return Constant.fromValue(left.stringValue() + String.valueOf(right.floatValue()));
-//					case T_double:	return Constant.fromValue(left.stringValue() + String.valueOf(right.doubleValue()));
-//					case T_byte:	return Constant.fromValue(left.stringValue() + String.valueOf(right.byteValue()));
-//					case T_short:	return Constant.fromValue(left.stringValue() + String.valueOf(right.shortValue()));
-//					case T_int:		return Constant.fromValue(left.stringValue() + String.valueOf(right.intValue()));
-//					case T_long:	return Constant.fromValue(left.stringValue() + String.valueOf(right.longValue()));
-//					case T_JavaLangString:	return Constant.fromValue(left.stringValue() + right.stringValue());
-//					case T_boolean:	return Constant.fromValue(left.stringValue() + right.booleanValue());
-//				}
-		}
-		return NotAConstant;
-	}
-
-	public static final Constant computeConstantOperationREMAINDER(Constant left, int leftId, Constant right, int rightId) {
-		switch (leftId){
-			case T_char :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.charValue() % right.charValue());
-					case T_float:	return FloatConstant.fromValue(left.charValue() % right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.charValue() % right.doubleValue());
-					case T_byte:	return IntConstant.fromValue(left.charValue() % right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.charValue() % right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.charValue() % right.intValue());
-					case T_long:	return LongConstant.fromValue(left.charValue() % right.longValue());
-				}
-				break;
-			case T_float :
-				switch (rightId){
-					case T_char :	return FloatConstant.fromValue(left.floatValue() % right.charValue());
-					case T_float:	return FloatConstant.fromValue(left.floatValue() % right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.floatValue() % right.doubleValue());
-					case T_byte:	return FloatConstant.fromValue(left.floatValue() % right.byteValue());
-					case T_short:	return FloatConstant.fromValue(left.floatValue() % right.shortValue());
-					case T_int:		return FloatConstant.fromValue(left.floatValue() % right.intValue());
-					case T_long:	return FloatConstant.fromValue(left.floatValue() % right.longValue());
-				}
-				break;
-			case T_double :
-				switch (rightId){
-					case T_char :	return DoubleConstant.fromValue(left.doubleValue() % right.charValue());
-					case T_float:	return DoubleConstant.fromValue(left.doubleValue() % right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.doubleValue() % right.doubleValue());
-					case T_byte:	return DoubleConstant.fromValue(left.doubleValue() % right.byteValue());
-					case T_short:	return DoubleConstant.fromValue(left.doubleValue() % right.shortValue());
-					case T_int:		return DoubleConstant.fromValue(left.doubleValue() % right.intValue());
-					case T_long:	return DoubleConstant.fromValue(left.doubleValue() % right.longValue());
-				}
-				break;
-			case T_byte :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.byteValue() % right.charValue());
-					case T_float:	return FloatConstant.fromValue(left.byteValue() % right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.byteValue() % right.doubleValue());
-					case T_byte:	return IntConstant.fromValue(left.byteValue() % right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.byteValue() % right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.byteValue() % right.intValue());
-					case T_long:	return LongConstant.fromValue(left.byteValue() % right.longValue());
-				}
-				break;
-			case T_short :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.shortValue() % right.charValue());
-					case T_float:	return FloatConstant.fromValue(left.shortValue() % right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.shortValue() % right.doubleValue());
-					case T_byte:	return IntConstant.fromValue(left.shortValue() % right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.shortValue() % right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.shortValue() % right.intValue());
-					case T_long:	return LongConstant.fromValue(left.shortValue() % right.longValue());
-				}
-				break;
-			case T_int :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.intValue() % right.charValue());
-					case T_float:	return FloatConstant.fromValue(left.intValue() % right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.intValue() % right.doubleValue());
-					case T_byte:	return IntConstant.fromValue(left.intValue() % right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.intValue() % right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.intValue() % right.intValue());
-					case T_long:	return LongConstant.fromValue(left.intValue() % right.longValue());
-				}
-				break;
-			case T_long :
-				switch (rightId){
-					case T_char :	return LongConstant.fromValue(left.longValue() % right.charValue());
-					case T_float:	return FloatConstant.fromValue(left.longValue() % right.floatValue());
-					case T_double:	return DoubleConstant.fromValue(left.longValue() % right.doubleValue());
-					case T_byte:	return LongConstant.fromValue(left.longValue() % right.byteValue());
-					case T_short:	return LongConstant.fromValue(left.longValue() % right.shortValue());
-					case T_int:		return LongConstant.fromValue(left.longValue() % right.intValue());
-					case T_long:	return LongConstant.fromValue(left.longValue() % right.longValue());
-				}
-		}
-		return NotAConstant;
-	}
-
-	public static final Constant computeConstantOperationRIGHT_SHIFT(Constant left, int leftId, Constant right, int rightId) {
-		switch (leftId){
-			case T_char :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.charValue() >> right.charValue());
-					case T_byte:	return IntConstant.fromValue(left.charValue() >> right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.charValue() >> right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.charValue() >> right.intValue());
-					case T_long:	return IntConstant.fromValue(left.charValue() >> right.longValue());
-				}
-				break;
-			case T_byte :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.byteValue() >> right.charValue());
-					case T_byte:	return IntConstant.fromValue(left.byteValue() >> right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.byteValue() >> right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.byteValue() >> right.intValue());
-					case T_long:	return IntConstant.fromValue(left.byteValue() >> right.longValue());
-				}
-				break;
-			case T_short :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.shortValue() >> right.charValue());
-					case T_byte:	return IntConstant.fromValue(left.shortValue() >> right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.shortValue() >> right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.shortValue() >> right.intValue());
-					case T_long:	return IntConstant.fromValue(left.shortValue() >> right.longValue());
-				}
-				break;
-			case T_int :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.intValue() >> right.charValue());
-					case T_byte:	return IntConstant.fromValue(left.intValue() >> right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.intValue() >> right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.intValue() >> right.intValue());
-					case T_long:	return IntConstant.fromValue(left.intValue() >> right.longValue());
-				}
-				break;
-			case T_long :
-				switch (rightId){
-					case T_char :	return LongConstant.fromValue(left.longValue() >> right.charValue());
-					case T_byte:	return LongConstant.fromValue(left.longValue() >> right.byteValue());
-					case T_short:	return LongConstant.fromValue(left.longValue() >> right.shortValue());
-					case T_int:		return LongConstant.fromValue(left.longValue() >> right.intValue());
-					case T_long:	return LongConstant.fromValue(left.longValue() >> right.longValue());
-				}
-		}
-		return NotAConstant;
-	}
-
-	public static final Constant computeConstantOperationUNSIGNED_RIGHT_SHIFT(Constant left, int leftId, Constant right, int rightId) {
-		switch (leftId){
-			case T_char :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.charValue() >>> right.charValue());
-					case T_byte:	return IntConstant.fromValue(left.charValue() >>> right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.charValue() >>> right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.charValue() >>> right.intValue());
-					case T_long:	return IntConstant.fromValue(left.charValue() >>> right.longValue());
-				}
-				break;
-			case T_byte :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.byteValue() >>> right.charValue());
-					case T_byte:	return IntConstant.fromValue(left.byteValue() >>> right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.byteValue() >>> right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.byteValue() >>> right.intValue());
-					case T_long:	return IntConstant.fromValue(left.byteValue() >>> right.longValue());
-				}
-				break;
-			case T_short :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.shortValue() >>> right.charValue());
-					case T_byte:	return IntConstant.fromValue(left.shortValue() >>> right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.shortValue() >>> right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.shortValue() >>> right.intValue());
-					case T_long:	return IntConstant.fromValue(left.shortValue() >>> right.longValue());
-				}
-				break;
-			case T_int :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.intValue() >>> right.charValue());
-					case T_byte:	return IntConstant.fromValue(left.intValue() >>> right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.intValue() >>> right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.intValue() >>> right.intValue());
-					case T_long:	return IntConstant.fromValue(left.intValue() >>> right.longValue());
-				}
-				break;
-			case T_long :
-				switch (rightId){
-					case T_char :	return LongConstant.fromValue(left.longValue() >>> right.charValue());
-					case T_byte:	return LongConstant.fromValue(left.longValue() >>> right.byteValue());
-					case T_short:	return LongConstant.fromValue(left.longValue() >>> right.shortValue());
-					case T_int:		return LongConstant.fromValue(left.longValue() >>> right.intValue());
-					case T_long:	return LongConstant.fromValue(left.longValue() >>> right.longValue());
-				}
-		}
-		return NotAConstant;
-	}
-
-	public static final Constant computeConstantOperationXOR(Constant left, int leftId, Constant right, int rightId) {
-		switch (leftId){
-			case T_boolean :		return BooleanConstant.fromValue(left.booleanValue() ^ right.booleanValue());
-			case T_char :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.charValue() ^ right.charValue());
-					case T_byte:	return IntConstant.fromValue(left.charValue() ^ right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.charValue() ^ right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.charValue() ^ right.intValue());
-					case T_long:	return LongConstant.fromValue(left.charValue() ^ right.longValue());
-				}
-				break;
-			case T_byte :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.byteValue() ^ right.charValue());
-					case T_byte:	return IntConstant.fromValue(left.byteValue() ^ right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.byteValue() ^ right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.byteValue() ^ right.intValue());
-					case T_long:	return LongConstant.fromValue(left.byteValue() ^ right.longValue());
-				}
-				break;
-			case T_short :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.shortValue() ^ right.charValue());
-					case T_byte:	return IntConstant.fromValue(left.shortValue() ^ right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.shortValue() ^ right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.shortValue() ^ right.intValue());
-					case T_long:	return LongConstant.fromValue(left.shortValue() ^ right.longValue());
-				}
-				break;
-			case T_int :
-				switch (rightId){
-					case T_char :	return IntConstant.fromValue(left.intValue() ^ right.charValue());
-					case T_byte:	return IntConstant.fromValue(left.intValue() ^ right.byteValue());
-					case T_short:	return IntConstant.fromValue(left.intValue() ^ right.shortValue());
-					case T_int:		return IntConstant.fromValue(left.intValue() ^ right.intValue());
-					case T_long:	return LongConstant.fromValue(left.intValue() ^ right.longValue());
-				}
-				break;
-			case T_long :
-				switch (rightId){
-					case T_char :	return LongConstant.fromValue(left.longValue() ^ right.charValue());
-					case T_byte:	return LongConstant.fromValue(left.longValue() ^ right.byteValue());
-					case T_short:	return LongConstant.fromValue(left.longValue() ^ right.shortValue());
-					case T_int:		return LongConstant.fromValue(left.longValue() ^ right.intValue());
-					case T_long:	return LongConstant.fromValue(left.longValue() ^ right.longValue());
-				}
-		}
-		return NotAConstant;
-	}
-
-	public double doubleValue() {
-		throw new ShouldNotImplement(Messages.bind(Messages.constant_cannotCastedInto, new String[] { typeName(), "double" })); //$NON-NLS-1$
-	}
-
-	public float floatValue() {
-		throw new ShouldNotImplement(Messages.bind(Messages.constant_cannotCastedInto, new String[] { typeName(), "float" })); //$NON-NLS-1$
-	}
-
-	/**
-	 * Returns true if both constants have the same type and the same actual value
-	 * @param otherConstant
-	 */
-	public boolean hasSameValue(Constant otherConstant) {
-		if (this == otherConstant)
-			return true;
-		int typeID;
-		if ((typeID = typeID()) != otherConstant.typeID())
-			return false;
-		switch (typeID) {
-			case TypeIds.T_boolean:
-				return booleanValue() == otherConstant.booleanValue();
-			case TypeIds.T_byte:
-				return byteValue() == otherConstant.byteValue();
-			case TypeIds.T_char:
-				return charValue() == otherConstant.charValue();
-			case TypeIds.T_double:
-				return doubleValue() == otherConstant.doubleValue();
-			case TypeIds.T_float:
-				return floatValue() == otherConstant.floatValue();
-			case TypeIds.T_int:
-				return intValue() == otherConstant.intValue();
-			case TypeIds.T_short:
-				return shortValue() == otherConstant.shortValue();
-			case TypeIds.T_long:
-				return longValue() == otherConstant.longValue();
-			case TypeIds.T_JavaLangString:
-				String value = stringValue();
-				return value == null
-					? otherConstant.stringValue() == null
-					: value.equals(otherConstant.stringValue());
-		}
-		return false;
-	}
-
-	public int intValue() {
-		throw new ShouldNotImplement(Messages.bind(Messages.constant_cannotCastedInto, new String[] { typeName(), "int" })); //$NON-NLS-1$
-	}
-
-	public long longValue() {
-		throw new ShouldNotImplement(Messages.bind(Messages.constant_cannotCastedInto, new String[] { typeName(), "long" })); //$NON-NLS-1$
-	}
-
-	public short shortValue() {
-		throw new ShouldNotImplement(Messages.bind(Messages.constant_cannotConvertedTo, new String[] { typeName(), "short" })); //$NON-NLS-1$
-	}
-
-	public String stringValue() {
-		throw new ShouldNotImplement(Messages.bind(Messages.constant_cannotConvertedTo, new String[] { typeName(), "String" })); //$NON-NLS-1$
-	}
-
-	@Override
-	public String toString(){
-		if (this == NotAConstant) return "(Constant) NotAConstant"; //$NON-NLS-1$
-		return super.toString(); }
-
-	public abstract int typeID();
-
-	public String typeName() {
-		switch (typeID()) {
-			case T_int : return "int"; //$NON-NLS-1$
-			case T_byte : return "byte"; //$NON-NLS-1$
-			case T_short : return "short"; //$NON-NLS-1$
-			case T_char : return "char"; //$NON-NLS-1$
-			case T_float : return "float"; //$NON-NLS-1$
-			case T_double : return "double"; //$NON-NLS-1$
-			case T_boolean : return "boolean"; //$NON-NLS-1$
-			case T_long : return "long";//$NON-NLS-1$
-			case T_JavaLangString : return "java.lang.String"; //$NON-NLS-1$
-			default: return "unknown"; //$NON-NLS-1$
-		}
-	}
-}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/DoubleConstant.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/DoubleConstant.java
deleted file mode 100644
index 2baaaf1e2..000000000
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/DoubleConstant.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.compiler.impl;
-
-public class DoubleConstant extends Constant {
-
-	private double value;
-
-	public static Constant fromValue(double value) {
-		return new DoubleConstant(value);
-	}
-
-	private DoubleConstant(double value) {
-		this.value = value;
-	}
-
-	@Override
-	public byte byteValue() {
-		return (byte) this.value;
-	}
-
-	@Override
-	public char charValue() {
-		return (char) this.value;
-	}
-
-	@Override
-	public double doubleValue() {
-		return this.value;
-	}
-
-	@Override
-	public float floatValue() {
-		return (float) this.value;
-	}
-
-	@Override
-	public int intValue() {
-		return (int) this.value;
-	}
-
-	@Override
-	public long longValue() {
-		return (long) this.value;
-	}
-
-	@Override
-	public short shortValue() {
-		return (short) this.value;
-	}
-
-	@Override
-	public String stringValue() {
-		return String.valueOf(this.value);
-	}
-
-	@Override
-	public String toString() {
-		if (this == NotAConstant)
-			return "(Constant) NotAConstant"; //$NON-NLS-1$
-		return "(double)" + this.value;  //$NON-NLS-1$
-	}
-
-	@Override
-	public int typeID() {
-		return T_double;
-	}
-
-	@Override
-	public int hashCode() {
-		long temp = Double.doubleToLongBits(this.value);
-		return (int) (temp ^ (temp >>> 32));
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) {
-			return true;
-		}
-		if (obj == null) {
-			return false;
-		}
-		if (getClass() != obj.getClass()) {
-			return false;
-		}
-		DoubleConstant other = (DoubleConstant) obj;
-		return Double.doubleToLongBits(this.value) == Double.doubleToLongBits(other.value);
-	}
-}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/FloatConstant.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/FloatConstant.java
deleted file mode 100644
index 37b4cb298..000000000
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/FloatConstant.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.compiler.impl;
-
-public class FloatConstant extends Constant {
-
-	float value;
-
-	public static Constant fromValue(float value) {
-		return new FloatConstant(value);
-	}
-
-	private FloatConstant(float value) {
-		this.value = value;
-	}
-
-	@Override
-	public byte byteValue() {
-		return (byte) this.value;
-	}
-
-	@Override
-	public char charValue() {
-		return (char) this.value;
-	}
-
-	@Override
-	public double doubleValue() {
-		return this.value; // implicit cast to return type
-	}
-
-	@Override
-	public float floatValue() {
-		return this.value;
-	}
-
-	@Override
-	public int intValue() {
-		return (int) this.value;
-	}
-
-	@Override
-	public long longValue() {
-		return (long) this.value;
-	}
-
-	@Override
-	public short shortValue() {
-		return (short) this.value;
-	}
-
-	@Override
-	public String stringValue() {
-		return String.valueOf(this.value);
-	}
-
-	@Override
-	public String toString() {
-		return "(float)" + this.value; //$NON-NLS-1$
-	}
-
-	@Override
-	public int typeID() {
-		return T_float;
-	}
-
-	@Override
-	public int hashCode() {
-		return Float.floatToIntBits(this.value);
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) {
-			return true;
-		}
-		if (obj == null) {
-			return false;
-		}
-		if (getClass() != obj.getClass()) {
-			return false;
-		}
-		FloatConstant other = (FloatConstant) obj;
-		return Float.floatToIntBits(this.value) == Float.floatToIntBits(other.value);
-	}
-}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/ITypeRequestor.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/ITypeRequestor.java
deleted file mode 100644
index 3872a021e..000000000
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/ITypeRequestor.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2018 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Fraunhofer FIRST - extended API and implementation
- *     Technical University Berlin - extended API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.compiler.impl;
-
-import org.eclipse.jdt.internal.compiler.env.AccessRestriction;
-import org.eclipse.jdt.internal.compiler.env.IBinaryModule;
-import org.eclipse.jdt.internal.compiler.env.IBinaryType;
-import org.eclipse.jdt.internal.compiler.env.ICompilationUnit;
-import org.eclipse.jdt.internal.compiler.env.IModule;
-import org.eclipse.jdt.internal.compiler.env.ISourceModule;
-import org.eclipse.jdt.internal.compiler.env.ISourceType;
-import org.eclipse.jdt.internal.compiler.lookup.BinaryModuleBinding;
-import org.eclipse.jdt.internal.compiler.lookup.LookupEnvironment;
-import org.eclipse.jdt.internal.compiler.lookup.PackageBinding;
-import org.eclipse.jdt.internal.compiler.parser.Parser;
-
-public interface ITypeRequestor {
-
-	/**
-	 * Accept the resolved binary form for the requested type.
-	 */
-	void accept(IBinaryType binaryType, PackageBinding packageBinding, AccessRestriction accessRestriction);
-
-	/**
-	 * Accept the requested type's compilation unit.
-	 */
-	void accept(ICompilationUnit unit, AccessRestriction accessRestriction);
-
-	/**
-	 * Accept the unresolved source forms for the requested type.
-	 * Note that the multiple source forms can be answered, in case the target compilation unit
-	 * contains multiple types. The first one is then guaranteed to be the one corresponding to the
-	 * requested type.
-	 */
-	void accept(ISourceType[] sourceType, PackageBinding packageBinding, AccessRestriction accessRestriction);
-
-	/**
-	 * Accept the requested module, could come in in one of 3 different forms:
-	 * <ul>
-	 * <li>{@link IBinaryModule}
-	 * <li>{@link ISourceModule}
-	 * <li>IModule.AutoModule
-	 * </ul>
-	 *
-	 * @since 3.14
-	 */
-	default void accept(IModule module, LookupEnvironment environment) {
-		if (module instanceof ISourceModule) {
-			ICompilationUnit compilationUnit = ((ISourceModule) module).getCompilationUnit();
-			if (compilationUnit != null) {
-				accept(compilationUnit, null);
-			}
-		} else {
-			// handles IBinaryModule and IModule.AutoModule:
-			BinaryModuleBinding.create(module, environment);
-		}
-	}
-
-//{ObjectTeams: interface to decouple Config<->MatchLocator
-	/**
-     * If this type requestor would produce side-effects when parsing method bodies,
-     * this method will return a different parser without side effects.
-     */
-	Parser getPlainParser();
-// SH}
-}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/IntConstant.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/IntConstant.java
deleted file mode 100644
index 9c9965680..000000000
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/IntConstant.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.compiler.impl;
-
-public class IntConstant extends Constant {
-
-	int value;
-
-	private static final IntConstant MIN_VALUE = new IntConstant(Integer.MIN_VALUE);
-	private static final IntConstant MINUS_FOUR = new IntConstant(-4);
-	private static final IntConstant MINUS_THREE = new IntConstant(-3);
-	private static final IntConstant MINUS_TWO = new IntConstant(-2);
-	private static final IntConstant MINUS_ONE = new IntConstant(-1);
-	private static final IntConstant ZERO = new IntConstant(0);
-	private static final IntConstant ONE = new IntConstant(1);
-	private static final IntConstant TWO = new IntConstant(2);
-	private static final IntConstant THREE = new IntConstant(3);
-	private static final IntConstant FOUR = new IntConstant(4);
-	private static final IntConstant FIVE = new IntConstant(5);
-	private static final IntConstant SIX = new IntConstant(6);
-	private static final IntConstant SEVEN = new IntConstant(7);
-	private static final IntConstant EIGHT= new IntConstant(8);
-	private static final IntConstant NINE = new IntConstant(9);
-	private static final IntConstant TEN = new IntConstant(10);
-
-	public static Constant fromValue(int value) {
-		switch (value) {
-			case Integer.MIN_VALUE : return IntConstant.MIN_VALUE;
-			case -4 : return IntConstant.MINUS_FOUR;
-			case -3 : return IntConstant.MINUS_THREE;
-			case -2 : return IntConstant.MINUS_TWO;
-			case -1 : return IntConstant.MINUS_ONE;
-			case 0 : return IntConstant.ZERO;
-			case 1 : return IntConstant.ONE;
-			case 2 : return IntConstant.TWO;
-			case 3 : return IntConstant.THREE;
-			case 4 : return IntConstant.FOUR;
-			case 5 : return IntConstant.FIVE;
-			case 6 : return IntConstant.SIX;
-			case 7 : return IntConstant.SEVEN;
-			case 8 : return IntConstant.EIGHT;
-			case 9 : return IntConstant.NINE;
-			case 10 : return IntConstant.TEN;
-		}
-		return new IntConstant(value);
-	}
-
-	private IntConstant(int value) {
-		this.value = value;
-	}
-
-	@Override
-	public byte byteValue() {
-		return (byte) this.value;
-	}
-
-	@Override
-	public char charValue() {
-		return (char) this.value;
-	}
-
-	@Override
-	public double doubleValue() {
-		return this.value; // implicit cast to return type
-	}
-
-	@Override
-	public float floatValue() {
-		return this.value; // implicit cast to return type
-	}
-
-	@Override
-	public int intValue() {
-		return this.value;
-	}
-
-	@Override
-	public long longValue() {
-		return this.value; // implicit cast to return type
-	}
-
-	@Override
-	public short shortValue() {
-		return (short) this.value;
-	}
-
-	@Override
-	public String stringValue() {
-		//spec 15.17.11
-		return String.valueOf(this.value);
-	}
-
-	@Override
-	public String toString() {
-		return "(int)" + this.value; //$NON-NLS-1$
-	}
-
-	@Override
-	public int typeID() {
-		return T_int;
-	}
-
-	@Override
-	public int hashCode() {
-		return this.value;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) {
-			return true;
-		}
-		if (obj == null) {
-			return false;
-		}
-		if (getClass() != obj.getClass()) {
-			return false;
-		}
-		IntConstant other = (IntConstant) obj;
-		return this.value == other.value;
-	}
-}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/IrritantSet.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/IrritantSet.java
deleted file mode 100644
index 9285e0102..000000000
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/IrritantSet.java
+++ /dev/null
@@ -1,401 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2019 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Technical University Berlin - extended API and implementation
- *     Stephan Herrmann - Contributions for
- *     							bug 349326 - [1.7] new warning for missing try-with-resources
- *								bug 186342 - [compiler][null] Using annotations for null checking
- *								bug 370639 - [compiler][resource] restore the default for resource leak warnings
- *								bug 265744 - Enum switch should warn about missing default
- *								bug 374605 - Unreasonable warning for enum-based switch statements
- *								bug 381443 - [compiler][null] Allow parameter widening from @NonNull to unannotated
- *								Bug 441208 - [1.8][null]SuppressWarnings("null") does not suppress / marked Unnecessary
- *								Bug 410218 - Optional warning for arguments of "unexpected" types to Map#get(Object), Collection#remove(Object) et al.
- *******************************************************************************/
-
-package org.eclipse.jdt.internal.compiler.impl;
-
-import org.eclipse.jdt.internal.compiler.ast.ASTNode;
-
-/**
- * Represent a set of irritant flags. Irritants are organized in up to 8 group
- * of 29, allowing for a maximum of 232 distinct irritants.
- */
-public class IrritantSet {
-
-	// Reserve two high bits for selecting the right bit pattern
-	public final static int GROUP_MASK = ASTNode.Bit32 | ASTNode.Bit31 | ASTNode.Bit30;
-	public final static int GROUP_SHIFT = 29;
-//{ObjectTeams: we use 4. group:
-/* orig:
-	public final static int GROUP_MAX = 3; // can be increased up to 8
-  :giro */
-	public final static int GROUP_MAX = 4; // can be increased up to 8
-// SH}
-
-	// Group prefix for irritants
-	public final static int GROUP0 = 0 << GROUP_SHIFT;
-	public final static int GROUP1 = 1 << GROUP_SHIFT;
-	public final static int GROUP2 = 2 << GROUP_SHIFT;
-	// reveal subsequent groups as needed
-//{ObjectTeams: that's what I'll do ;-)
-/* orig:
-	// public final static int GROUP3 = 3 << GROUP_SHIFT;
-  :giro */
-	public final static int GROUP3 = 3 << GROUP_SHIFT;
-// SH}
-	// public final static int GROUP4 = 4 << GROUP_SHIFT;
-	// public final static int GROUP5 = 5 << GROUP_SHIFT;
-	// public final static int GROUP6 = 6 << GROUP_SHIFT;
-	// public final static int GROUP7 = 7 << GROUP_SHIFT;
-
-	// Predefine sets of irritants matching warning tokens
-	public static final IrritantSet ALL = new IrritantSet(0xFFFFFFFF & ~GROUP_MASK);
-	public static final IrritantSet BOXING = new IrritantSet(CompilerOptions.AutoBoxing);
-	public static final IrritantSet CAST = new IrritantSet(CompilerOptions.UnnecessaryTypeCheck);
-	public static final IrritantSet DEPRECATION = new IrritantSet(CompilerOptions.UsingDeprecatedAPI);
-	public static final IrritantSet TERMINAL_DEPRECATION = new IrritantSet(CompilerOptions.UsingTerminallyDeprecatedAPI);
-	public static final IrritantSet DEP_ANN = new IrritantSet(CompilerOptions.MissingDeprecatedAnnotation);
-	public static final IrritantSet FALLTHROUGH = new IrritantSet(CompilerOptions.FallthroughCase);
-	public static final IrritantSet FINALLY = new IrritantSet(CompilerOptions.FinallyBlockNotCompleting);
-	public static final IrritantSet HIDING = new IrritantSet(CompilerOptions.MaskedCatchBlock);
-	public static final IrritantSet INCOMPLETE_SWITCH = new IrritantSet(CompilerOptions.MissingEnumConstantCase);
-	public static final IrritantSet NLS = new IrritantSet(CompilerOptions.NonExternalizedString);
-	public static final IrritantSet NULL = new IrritantSet(CompilerOptions.NullReference);
-	public static final IrritantSet RAW = new IrritantSet(CompilerOptions.RawTypeReference);
-	public static final IrritantSet RESTRICTION = new IrritantSet(CompilerOptions.ForbiddenReference);
-	public static final IrritantSet SERIAL = new IrritantSet(CompilerOptions.MissingSerialVersion);
-	public static final IrritantSet STATIC_ACCESS = new IrritantSet(CompilerOptions.IndirectStaticAccess);
-	public static final IrritantSet STATIC_METHOD = new IrritantSet(CompilerOptions.MethodCanBeStatic);
-	public static final IrritantSet SYNTHETIC_ACCESS = new IrritantSet(CompilerOptions.AccessEmulation);
-	public static final IrritantSet SYNCHRONIZED = new IrritantSet(CompilerOptions.MissingSynchronizedModifierInInheritedMethod);
-	public static final IrritantSet SUPER = new IrritantSet(CompilerOptions.OverridingMethodWithoutSuperInvocation);
-	public static final IrritantSet UNUSED = new IrritantSet(CompilerOptions.UnusedLocalVariable);
-	public static final IrritantSet UNCHECKED = new IrritantSet(CompilerOptions.UncheckedTypeOperation);
-	public static final IrritantSet UNQUALIFIED_FIELD_ACCESS = new IrritantSet(CompilerOptions.UnqualifiedFieldAccess);
-	public static final IrritantSet RESOURCE = new IrritantSet(CompilerOptions.UnclosedCloseable);
-	public static final IrritantSet UNLIKELY_ARGUMENT_TYPE = new IrritantSet(CompilerOptions.UnlikelyCollectionMethodArgumentType);
-	public static final IrritantSet API_LEAK = new IrritantSet(CompilerOptions.APILeak);
-	public static final IrritantSet MODULE = new IrritantSet(CompilerOptions.UnstableAutoModuleName);
-
-	public static final IrritantSet JAVADOC = new IrritantSet(CompilerOptions.InvalidJavadoc);
-	public static final IrritantSet PREVIEW = new IrritantSet(CompilerOptions.PreviewFeatureUsed);
-	public static final IrritantSet COMPILER_DEFAULT_ERRORS = new IrritantSet(0); // no optional error by default
-	public static final IrritantSet COMPILER_DEFAULT_WARNINGS = new IrritantSet(0); // see static initializer below
-	public static final IrritantSet COMPILER_DEFAULT_INFOS = new IrritantSet(0); // see static initializer below
-//{ObjectTeams: new irritants:
-	public static final IrritantSet NOT_EXACTLY_ONE_BASECALL = new IrritantSet(
-            CompilerOptions.NotExactlyOneBasecall);
-	public static final IrritantSet BASECALL_CYCLE = new IrritantSet(
-            CompilerOptions.BaseclassCycle);
-	public static final IrritantSet UNSAFE_ROLE_INSTANTIATION = new IrritantSet(
-            CompilerOptions.UnsafeRoleInstantiation);
-	public static final IrritantSet FRAGILE_CALLIN = new IrritantSet(
-            CompilerOptions.FragileCallin);
-	public static final IrritantSet POTENTIAL_AMBIGUOUS_PLAYEDBY = new IrritantSet(
-            CompilerOptions.PotentialAmbiguousPlayedBy);
-	public static final IrritantSet ABSTRACT_POTENTIAL_RELEVANT_ROLE = new IrritantSet(
-            CompilerOptions.AbstractPotentialRelevantRole);
-	public static final IrritantSet HIDDEN_LIFTING_PROBLEM = new IrritantSet(
-            CompilerOptions.HiddenLiftingProblem);
-	public static final IrritantSet DECAPSULATION = new IrritantSet(
-            CompilerOptions.Decapsulation | CompilerOptions.DecapsulationWrite);
-	public static final IrritantSet BINDING_CONVENTIONS = new IrritantSet(
-            CompilerOptions.BindingConventions);
-	public static final IrritantSet ADDING_INFERRED_CALLOUT = new IrritantSet(
-            CompilerOptions.AddingInferredCallout);
-	public static final IrritantSet DEPRECATED_PATH_SYNTAX = new IrritantSet(
-            CompilerOptions.DeprecatedPathSyntax);
-	public static final IrritantSet WEAVE_INTO_SYSTEM_CLASS = new IrritantSet(
-            CompilerOptions.WeaveIntoSystemClass);
-	public static final IrritantSet DANGEROUS_CALLIN = new IrritantSet(
-            CompilerOptions.DangerousCallin);
-	public static final IrritantSet OVERRIDING_FINAL_ROLE = new IrritantSet(
-            CompilerOptions.OverridingFinalRole);
-	public static final IrritantSet EXCEPTION_IN_GUARD = new IrritantSet(
-            CompilerOptions.ExceptionInGuard);
-	public static final IrritantSet AMBIGUOUS_LOWERING = new IrritantSet(
-            CompilerOptions.AmbiguousLowering);
-	public static final IrritantSet ADAPT_DEPRECATED = new IrritantSet(
-            CompilerOptions.AdaptingDeprecated);
-	public static final IrritantSet IGNORING_ROLE_RETURN = new IrritantSet(
-			CompilerOptions.IgnoringRoleReturn);
-// SH}
-	static {
-//{ObjectTeams: default to error:
-		COMPILER_DEFAULT_ERRORS
-			.set(CompilerOptions.AddingInferredCallout
-				 | CompilerOptions.ExceptionInGuard
-				 | CompilerOptions.OverridingFinalRole
-				 | CompilerOptions.AdaptingDeprecated
-				 | CompilerOptions.HiddenLiftingProblem);
-// SH}
-		COMPILER_DEFAULT_INFOS
-		// group-2 infos enabled by default
-		.set(
-			CompilerOptions.UnlikelyEqualsArgumentType
-			| CompilerOptions.SuppressWarningsNotAnalysed
-			| CompilerOptions.AnnotatedTypeArgumentToUnannotated);
-
-		COMPILER_DEFAULT_WARNINGS
-//{ObjectTeams: default to warning (group 3):
-			.set(CompilerOptions.BindingConventions
-				| CompilerOptions.NotExactlyOneBasecall
-				| CompilerOptions.BaseclassCycle
-				| CompilerOptions.UnsafeRoleInstantiation
-				| CompilerOptions.EffectlessFieldaccess
-				| CompilerOptions.FragileCallin
-				| CompilerOptions.UnusedParammap
-				| CompilerOptions.EffectlessCallinBinding
-				| CompilerOptions.PotentialAmbiguousPlayedBy
-				| CompilerOptions.AbstractPotentialRelevantRole
-				| CompilerOptions.Decapsulation
-				| CompilerOptions.DecapsulationWrite
-				| CompilerOptions.DeprecatedPathSyntax
-				| CompilerOptions.WeaveIntoSystemClass
-				| CompilerOptions.DangerousCallin
-				| CompilerOptions.AmbiguousLowering
-				| CompilerOptions.IgnoringRoleReturn
-				| CompilerOptions.OTREintoJava8)
-// SH}
-			// group-0 warnings enabled by default
-			.set(
-				CompilerOptions.MethodWithConstructorName
-				| CompilerOptions.OverriddenPackageDefaultMethod
-				| CompilerOptions.UsingDeprecatedAPI
-				| CompilerOptions.MaskedCatchBlock
-				| CompilerOptions.UnusedLocalVariable
-				| CompilerOptions.NoImplicitStringConversion
-				| CompilerOptions.AssertUsedAsAnIdentifier
-				| CompilerOptions.UnusedImport
-				| CompilerOptions.NonStaticAccessToStatic
-				| CompilerOptions.NoEffectAssignment
-				| CompilerOptions.IncompatibleNonInheritedInterfaceMethod
-				| CompilerOptions.UnusedPrivateMember
-				| CompilerOptions.FinallyBlockNotCompleting)
-			// group-1 warnings enabled by default
-			.set(
-				CompilerOptions.UncheckedTypeOperation
-				| CompilerOptions.FinalParameterBound
-				| CompilerOptions.MissingSerialVersion
-				| CompilerOptions.EnumUsedAsAnIdentifier
-				| CompilerOptions.ForbiddenReference
-				| CompilerOptions.VarargsArgumentNeedCast
-				| CompilerOptions.NullReference
-				| CompilerOptions.AnnotationSuperInterface
-				| CompilerOptions.TypeHiding
-				| CompilerOptions.DiscouragedReference
-				| CompilerOptions.UnhandledWarningToken
-				| CompilerOptions.RawTypeReference
-				| CompilerOptions.UnusedLabel
-				| CompilerOptions.UnusedTypeArguments
-				| CompilerOptions.UnusedWarningToken
-				| CompilerOptions.ComparingIdentical
-				| CompilerOptions.MissingEnumConstantCase)
-			// group-2 warnings enabled by default
-			.set(
-				CompilerOptions.DeadCode
-				|CompilerOptions.Tasks
-				|CompilerOptions.UnclosedCloseable
-				|CompilerOptions.NullUncheckedConversion
-				|CompilerOptions.RedundantNullAnnotation
-				|CompilerOptions.NonnullParameterAnnotationDropped
-				|CompilerOptions.PessimisticNullAnalysisForFreeTypeVariables
-				|CompilerOptions.NonNullTypeVariableFromLegacyInvocation
-				|CompilerOptions.UnlikelyCollectionMethodArgumentType
-				|CompilerOptions.UsingTerminallyDeprecatedAPI
-				|CompilerOptions.APILeak
-				|CompilerOptions.UnstableAutoModuleName
-				|CompilerOptions.PreviewFeatureUsed);
-		// default errors IF AnnotationBasedNullAnalysis is enabled:
-		COMPILER_DEFAULT_ERRORS.set(
-				CompilerOptions.NullSpecViolation
-				|CompilerOptions.NullAnnotationInferenceConflict);
-
-		ALL.setAll();
-		HIDING
-			.set(CompilerOptions.FieldHiding)
-			.set(CompilerOptions.LocalVariableHiding)
-			.set(CompilerOptions.TypeHiding);
-		NULL
-			.set(CompilerOptions.PotentialNullReference)
-			.set(CompilerOptions.RedundantNullCheck)
-			.set(CompilerOptions.NullSpecViolation)
-			.set(CompilerOptions.NullAnnotationInferenceConflict)
-			.set(CompilerOptions.NullUncheckedConversion)
-			.set(CompilerOptions.RedundantNullAnnotation)
-			.set(CompilerOptions.NonnullParameterAnnotationDropped)
-			.set(CompilerOptions.MissingNonNullByDefaultAnnotation)
-			.set(CompilerOptions.PessimisticNullAnalysisForFreeTypeVariables)
-			.set(CompilerOptions.NonNullTypeVariableFromLegacyInvocation)
-			.set(CompilerOptions.AnnotatedTypeArgumentToUnannotated);
-
-		RESTRICTION.set(CompilerOptions.DiscouragedReference);
-		STATIC_ACCESS.set(CompilerOptions.NonStaticAccessToStatic);
-		UNUSED
-			.set(CompilerOptions.UnusedArgument)
-			.set(CompilerOptions.UnusedExceptionParameter)
-			.set(CompilerOptions.UnusedPrivateMember)
-			.set(CompilerOptions.UnusedDeclaredThrownException)
-			.set(CompilerOptions.UnusedLabel)
-			.set(CompilerOptions.UnusedImport)
-			.set(CompilerOptions.UnusedTypeArguments)
-			.set(CompilerOptions.RedundantSuperinterface)
-			.set(CompilerOptions.DeadCode)
-			.set(CompilerOptions.UnusedObjectAllocation)
-			.set(CompilerOptions.UnusedTypeParameter)
-			.set(CompilerOptions.RedundantSpecificationOfTypeArguments);
-		STATIC_METHOD
-		    .set(CompilerOptions.MethodCanBePotentiallyStatic);
-		RESOURCE
-			.set(CompilerOptions.PotentiallyUnclosedCloseable)
-			.set(CompilerOptions.ExplicitlyClosedAutoCloseable);
-		INCOMPLETE_SWITCH.set(CompilerOptions.MissingDefaultCase);
-		String suppressRawWhenUnchecked = System.getProperty("suppressRawWhenUnchecked"); //$NON-NLS-1$
-		if (suppressRawWhenUnchecked != null && "true".equalsIgnoreCase(suppressRawWhenUnchecked)) { //$NON-NLS-1$
-			UNCHECKED.set(CompilerOptions.RawTypeReference);
-		}
-
-		JAVADOC
-			.set(CompilerOptions.MissingJavadocComments)
-			.set(CompilerOptions.MissingJavadocTags);
-
-		UNLIKELY_ARGUMENT_TYPE
-			.set(CompilerOptions.UnlikelyEqualsArgumentType);
-	}
-	// Internal state
-
-	private int[] bits = new int[GROUP_MAX];
-
-	/**
-	 * Constructor with initial irritant set
-	 */
-	public IrritantSet(int singleGroupIrritants) {
-		initialize(singleGroupIrritants);
-	}
-
-	/**
-	 * Constructor with initial irritant set
-	 */
-	public IrritantSet(IrritantSet other) {
-		initialize(other);
-	}
-
-	public boolean areAllSet() {
-		for (int i = 0; i < GROUP_MAX; i++) {
-			if (this.bits[i] != (0xFFFFFFFF & ~GROUP_MASK))
-				return false;
-		}
-		return true;
-	}
-
-	public IrritantSet clear(int singleGroupIrritants) {
-		int group = (singleGroupIrritants & GROUP_MASK) >> GROUP_SHIFT;
-		this.bits[group] &= ~singleGroupIrritants;
-		return this;
-	}
-
-	public IrritantSet clearAll() {
-		for (int i = 0; i < GROUP_MAX; i++) {
-			this.bits[i] = 0;
-		}
-		return this;
-	}
-
-	/**
-	 * Initialize a set of irritants in one group
-	 *
-	 * @param singleGroupIrritants
-	 */
-	public void initialize(int singleGroupIrritants) {
-		if (singleGroupIrritants == 0)
-			return;
-		int group = (singleGroupIrritants & GROUP_MASK) >> GROUP_SHIFT;
-		this.bits[group] = singleGroupIrritants & ~GROUP_MASK; // erase group information
-	}
-
-	public void initialize(IrritantSet other) {
-		if (other == null)
-			return;
-		System.arraycopy(other.bits, 0, this.bits = new int[GROUP_MAX], 0, GROUP_MAX);
-	}
-
-	/**
-	 * Returns true if any of the irritants in given other set is positionned in receiver
-	 * @param other
-	 */
-	public boolean isAnySet(IrritantSet other) {
-		if (other == null)
-			return false;
-		for (int i = 0; i < GROUP_MAX; i++) {
-			if ((this.bits[i] & other.bits[i]) != 0)
-				return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Returns true if all of the irritants in the given irritant set are set in receiver
-	 * @param irritantSet the given irritant set
-	 */
-	public boolean hasSameIrritants(IrritantSet irritantSet) {
-		if (irritantSet == null)
-			return false;
-		for (int i = 0; i < GROUP_MAX; i++) {
-			if (this.bits[i] != irritantSet.bits[i])
-				return false;
-		}
-		return true;
-	}
-
-	public boolean isSet(int singleGroupIrritants) {
-		int group = (singleGroupIrritants & GROUP_MASK) >> GROUP_SHIFT;
-		return (this.bits[group] & singleGroupIrritants) != 0;
-	}
-	public int[] getBits() {
-		return this.bits;
-	}
-	public IrritantSet set(int singleGroupIrritants) {
-		int group = (singleGroupIrritants & GROUP_MASK) >> GROUP_SHIFT;
-		this.bits[group] |= (singleGroupIrritants & ~GROUP_MASK); // erase the group bits
-		return this;
-	}
-
-	/**
-	 * Return updated irritantSet or null if it was a no-op
-	 *
-	 * @param other
-	 */
-	public IrritantSet set(IrritantSet other) {
-		if (other == null)
-			return this;
-		boolean wasNoOp = true;
-		for (int i = 0; i < GROUP_MAX; i++) {
-			int otherIrritant = other.bits[i] & ~GROUP_MASK; // erase the
-																	// group
-																	// bits
-			if ((this.bits[i] & otherIrritant) != otherIrritant) {
-				wasNoOp = false;
-				this.bits[i] |= otherIrritant;
-			}
-		}
-		return wasNoOp ? null : this;
-	}
-
-	public IrritantSet setAll() {
-		for (int i = 0; i < GROUP_MAX; i++) {
-			this.bits[i] |= 0xFFFFFFFF & ~GROUP_MASK; // erase the group
-															// bits;
-		}
-		return this;
-	}
-}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/JavaFeature.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/JavaFeature.java
deleted file mode 100644
index c54d1a5d7..000000000
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/JavaFeature.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2020, 2022 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
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.compiler.impl;
-
-import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
-import org.eclipse.jdt.internal.compiler.lookup.TypeConstants;
-import org.eclipse.jdt.internal.compiler.util.Messages;
-
-/**
- * An internal enumeration of all Java language features that were introduced as
- * standard feature or preview feature from Java 15. The idea is to have one
- * location where the applicability of a feature, such as version supported in,
- * whether or not a preview, what are the restricted keywords introduced by a
- * feature etc. This is expected to be updated every time there's a new Java
- * version and the change is expected to be one of the following kinds:
- * <ul>
- * <li>The preview feature continues to be a preview in the next version</li>
- * <li>The preview feature is upgraded to a standard feature</li>
- * <li>The preview feature is removed</li>
- * </ul>
- *
- * @author jay
- */
-public enum JavaFeature {
-
-	SWITCH_EXPRESSIONS(ClassFileConstants.JDK14,
-			Messages.bind(Messages.switch_expression),
-			new char[][] {TypeConstants.YIELD},
-			false),
-
-	TEXT_BLOCKS(ClassFileConstants.JDK15,
-			Messages.bind(Messages.text_block),
-			new char[][] {},
-			false),
-
-	PATTERN_MATCHING_IN_INSTANCEOF(ClassFileConstants.JDK16,
-			Messages.bind(Messages.pattern_matching_instanceof),
-			new char[][] {},
-			false),
-
-	RECORDS(ClassFileConstants.JDK16,
-			Messages.bind(Messages.records),
-			new char[][] {TypeConstants.RECORD_RESTRICTED_IDENTIFIER},
-			false),
-
-	SEALED_CLASSES(ClassFileConstants.JDK17,
-			Messages.bind(Messages.sealed_types),
-			new char[][] {TypeConstants.SEALED, TypeConstants.PERMITS},
-			false),
-	PATTERN_MATCHING_IN_SWITCH(ClassFileConstants.JDK19,
-			Messages.bind(Messages.pattern_matching_switch),
-			new char[][] {},
-			true),
-	RECORD_PATTERNS(ClassFileConstants.JDK19,
-			Messages.bind(Messages.record_patterns),
-			new char[][] {},
-			true),
-    ;
-
-	final long compliance;
-	final String name;
-	final boolean isPreview;
-	char[][] restrictedKeywords;
-
-	public boolean isPreview() {
-		return this.isPreview;
-	}
-	public String getName() {
-		return this.name;
-	}
-	public long getCompliance() {
-		return this.compliance;
-	}
-	public char[][] getRestrictedKeywords() {
-		return this.restrictedKeywords;
-	}
-	public boolean isSupported(CompilerOptions options) {
-		if (this.isPreview)
-			return options.enablePreviewFeatures;
-		return this.getCompliance() <= options.sourceLevel;
-	}
-	public boolean isSupported(long comp, boolean preview) {
-		if (this.isPreview)
-			return preview;
-		return this.getCompliance() <= comp;
-	}
-
-	JavaFeature(long compliance, String name, char[][] restrictedKeywords, boolean isPreview) {
-        this.compliance = compliance;
-        this.name = name;
-        this.isPreview = isPreview;
-        this.restrictedKeywords = restrictedKeywords;
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/LongConstant.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/LongConstant.java
deleted file mode 100644
index fc56beacb..000000000
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/LongConstant.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.compiler.impl;
-
-public class LongConstant extends Constant {
-
-		private static final LongConstant ZERO = new LongConstant(0L);
-		private static final LongConstant MIN_VALUE = new LongConstant(Long.MIN_VALUE);
-
-		private long value;
-
-public static Constant fromValue(long value) {
-	if (value == 0L) {
-		return ZERO;
-	} else if (value == Long.MIN_VALUE) {
-		return MIN_VALUE;
-	}
-	return new LongConstant(value);
-}
-
-private LongConstant(long value) {
-	this.value = value;
-}
-
-@Override
-public byte byteValue() {
-	return (byte) this.value;
-}
-
-@Override
-public char charValue() {
-	return (char) this.value;
-}
-
-@Override
-public double doubleValue() {
-	return this.value; // implicit cast to return type
-}
-
-@Override
-public float floatValue() {
-	return this.value; // implicit cast to return type
-}
-
-@Override
-public int intValue() {
-	return (int) this.value;
-}
-
-@Override
-public long longValue() {
-	return this.value;
-}
-
-@Override
-public short shortValue() {
-	return (short) this.value;
-}
-
-@Override
-public String stringValue() {
-	//spec 15.17.11
-	return String.valueOf(this.value);
-}
-
-@Override
-public String toString(){
-
-	return "(long)" + this.value ; //$NON-NLS-1$
-}
-
-@Override
-public int typeID() {
-	return T_long;
-}
-
-@Override
-public int hashCode() {
-	return (int) (this.value ^ (this.value >>> 32));
-}
-
-@Override
-public boolean equals(Object obj) {
-	if (this == obj) {
-		return true;
-	}
-	if (obj == null) {
-		return false;
-	}
-	if (getClass() != obj.getClass()) {
-		return false;
-	}
-	LongConstant other = (LongConstant) obj;
-	return this.value == other.value;
-}
-}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/ReferenceContext.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/ReferenceContext.java
deleted file mode 100644
index e1a03f22f..000000000
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/ReferenceContext.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Fraunhofer FIRST - extended API and implementation
- *     Technical University Berlin - extended API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.compiler.impl;
-
-/*
- * Implementors are valid compilation contexts from which we can
- * escape in case of error:
- * For example: method, type, compilation unit or a lambda expression.
- */
-
-import org.eclipse.jdt.core.compiler.CategorizedProblem;
-import org.eclipse.jdt.internal.compiler.CompilationResult;
-import org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;
-
-public interface ReferenceContext {
-
-	void abort(int abortLevel, CategorizedProblem problem);
-
-	CompilationResult compilationResult();
-
-	CompilationUnitDeclaration getCompilationUnitDeclaration();
-
-	boolean hasErrors();
-
-	void tagAsHavingErrors();
-
-	void tagAsHavingIgnoredMandatoryErrors(int problemId);
-
-//{ObjectTeams: some errors will have to be removed
-	void resetErrorFlag();
-// SH}
-}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/ShortConstant.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/ShortConstant.java
deleted file mode 100644
index 11dbb8caf..000000000
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/ShortConstant.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.compiler.impl;
-
-public class ShortConstant extends Constant {
-
-	private short value;
-
-	public static Constant fromValue(short value) {
-		return new ShortConstant(value);
-	}
-
-	private ShortConstant(short value) {
-		this.value = value;
-	}
-
-	@Override
-	public byte byteValue() {
-		return (byte) this.value;
-	}
-
-	@Override
-	public char charValue() {
-		return (char) this.value;
-	}
-
-	@Override
-	public double doubleValue() {
-		return this.value; // implicit cast to return type
-	}
-
-	@Override
-	public float floatValue() {
-		return this.value; // implicit cast to return type
-	}
-
-	@Override
-	public int intValue() {
-		return this.value; // implicit cast to return type
-	}
-
-	@Override
-	public long longValue() {
-		return this.value; // implicit cast to return type
-	}
-
-	@Override
-	public short shortValue() {
-		return this.value;
-	}
-
-	@Override
-	public String stringValue() {
-		// spec 15.17.11
-		return String.valueOf(this.value);
-	}
-
-	@Override
-	public String toString() {
-
-		return "(short)" + this.value; //$NON-NLS-1$
-	}
-
-	@Override
-	public int typeID() {
-		return T_short;
-	}
-
-	@Override
-	public int hashCode() {
-		return this.value;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) {
-			return true;
-		}
-		if (obj == null) {
-			return false;
-		}
-		if (getClass() != obj.getClass()) {
-			return false;
-		}
-		ShortConstant other = (ShortConstant) obj;
-		return this.value == other.value;
-	}
-}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/StringConstant.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/StringConstant.java
deleted file mode 100644
index 6de9e0f1d..000000000
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/StringConstant.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.compiler.impl;
-
-public class StringConstant extends Constant {
-
-	private String value;
-
-	public static Constant fromValue(String value) {
-		return new StringConstant(value);
-	}
-
-	private StringConstant(String value) {
-		this.value = value;
-	}
-
-	@Override
-	public String stringValue() {
-		// spec 15.17.11
-
-		// the next line do not go into the toString() send....!
-		return this.value;
-		/*
-		 * String s = value.toString() ; if (s == null) return "null"; else return s;
-		 */
-	}
-
-	@Override
-	public String toString() {
-		return "(String)\"" + this.value + "\""; //$NON-NLS-2$ //$NON-NLS-1$
-	}
-
-	@Override
-	public int typeID() {
-		return T_JavaLangString;
-	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((this.value == null) ? 0 : this.value.hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) {
-			return true;
-		}
-		if (obj == null) {
-			return false;
-		}
-		if (getClass() != obj.getClass()) {
-			return false;
-		}
-		StringConstant other = (StringConstant) obj;
-		if (this.value == null) {
-			return other.value == null;
-		} else {
-			return this.value.equals(other.value);
-		}
-	}
-}